Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1.2 and tip

stable manifestdialog: only pass a Workbench window as repoviewer (fixes #938)

This prevents a crash if the user attempts to annotate a file and then opens
a file history window and double clicks on a revision.

Changeset aa167d0167a3…

Parent 8862a40beb96…

by David Golub

Changes to one file · Browse files at aa167d0167a3 Showing diff from parent 8862a40beb96 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
22
23
24
 
25
26
27
 
283
284
285
286
287
 
 
 
 
288
289
290
 
22
23
24
25
26
27
28
 
284
285
286
 
 
287
288
289
290
291
292
293
@@ -22,6 +22,7 @@
 from tortoisehg.hgqt import visdiff, revert, revpanel  from tortoisehg.hgqt.filedialogs import FileLogDialog, FileDiffDialog  from tortoisehg.hgqt.manifestmodel import ManifestModel +from tortoisehg.hgqt.workbench import Workbench    class ManifestDialog(QMainWindow):   """ @@ -283,8 +284,10 @@
  if not filename:   filename = self.path   if filename not in dlgdict: - dlg = dlgclass(self._repo, filename, - repoviewer=self.window()) + repoviewer = self.window() + if not isinstance(repoviewer, Workbench): + repoviewer = None + dlg = dlgclass(self._repo, filename, repoviewer)   dlgdict[filename] = dlg   ufname = hglib.tounicode(filename)   dlg.setWindowTitle(_('Hg file log viewer - %s') % ufname)