[meld] meldapp: Don't try to set tab extras on failed tabs



commit 46b052fe5444d3d7c83fc3ace52027d835df3a71
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Jun 10 07:31:12 2014 +1000

    meldapp: Don't try to set tab extras on failed tabs

 meld/meldapp.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index a2c9c98..42a08aa 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -307,12 +307,12 @@ class MeldApp(Gtk.Application):
                     focus=i == 0)
             except ValueError as err:
                 error = err
+            else:
+                if options.label:
+                    tab.set_labels(options.label)
 
-            if options.label:
-                tab.set_labels(options.label)
-
-            if options.outfile and isinstance(tab, filediff.FileDiff):
-                tab.set_merge_output_file(options.outfile)
+                if options.outfile and isinstance(tab, filediff.FileDiff):
+                    tab.set_merge_output_file(options.outfile)
 
         if error:
             log.debug("Couldn't open comparison: %s", error)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]