Changeset bad263cdd8b6…
Parent 3fa6d2fa368e…
by
Changes to one file · Browse files at bad263cdd8b6 Showing diff from parent 3fa6d2fa368e Diff from another changeset...
@@ -618,11 +618,12 @@ self.auto_check()
selected = False
- if len(reselect) < 100: # issue 181 hack
- for row in model:
- if row[FM_PATH] in reselect:
- selection.select_iter(row.iter)
- selected = True
+ self.ready = False
+ for row in model:
+ if row[FM_PATH] in reselect:
+ selection.select_iter(row.iter)
+ selected = True
+ self.ready = True
if not selected:
selection.select_path((0,))
@@ -858,6 +859,8 @@ def merge_sel_changed(self, selection):
'Selected row in file tree activated changed (merge mode)'
# Update the diff text with merge diff to both parents
+ if not self.ready:
+ return
model, paths = selection.get_selected_rows()
if not paths:
return
@@ -902,6 +905,8 @@ def tree_sel_changed(self, selection):
'Selected row in file tree activated changed'
# Read this file's diffs into diff model
+ if not self.ready:
+ return
model, paths = selection.get_selected_rows()
if not paths:
return
|
Loading...