← Back to team overview

gtg team mailing list archive

[Merge] lp:~rivaldi8/gtg/bugfix-1280683 into lp:gtg

 

Àlex Magaz has proposed merging lp:~rivaldi8/gtg/bugfix-1280683 into lp:gtg.

Requested reviews:
  Gtg developers (gtg)
Related bugs:
  Bug #1280683 in Getting Things GNOME!: "Startup crash with wrong value in collapsed_tasks option"
  https://bugs.launchpad.net/gtg/+bug/1280683

For more details, see:
https://code.launchpad.net/~rivaldi8/gtg/bugfix-1280683/+merge/206620

Fixes bug #1280683.
-- 
https://code.launchpad.net/~rivaldi8/gtg/bugfix-1280683/+merge/206620
Your team Gtg developers is requested to review the proposed merge of lp:~rivaldi8/gtg/bugfix-1280683 into lp:gtg.
=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2013-12-18 16:20:01 +0000
+++ GTG/gtk/browser/browser.py	2014-02-16 16:20:33 +0000
@@ -31,6 +31,7 @@
 from GTG import _, info, ngettext
 from GTG.backends.backendsignals import BackendSignals
 from GTG.core import CoreConfig
+from GTG.core import DEFAULTS
 from GTG.core.search import parse_search_query, SEARCH_COMMANDS, InvalidQuery
 from GTG.core.task import Task
 from GTG.gtk.tag_completion import TagCompletion
@@ -430,6 +431,21 @@
         is_maximized = widget.get_window().get_state() & mask == mask
         self.config.set("max", is_maximized)
 
+    def restore_collapsed_tasks(self):
+        try:
+            for path_s in self.config.get("collapsed_tasks"):
+                # the tuple was stored as a string. we have to reconstruct it
+                path = ()
+                for p in path_s[1:-1].split(","):
+                    p = p.strip(" '")
+                    path += p,
+                if path[-1] == '':
+                    path = path[:-1]
+                self.vtree_panes['active'].collapse_node(path)
+        except:
+            self.config.set("collapsed_tasks",
+                            DEFAULTS["browser"]["collapsed_tasks"])
+
     def restore_state_from_conf(self):
 
 #        # Extract state from configuration dictionary
@@ -505,15 +521,7 @@
             sort_column, sort_order = int(sort_column), int(sort_order)
             model.set_sort_column_id(sort_column, sort_order)
 
-        for path_s in self.config.get("collapsed_tasks"):
-            # the tuple was stored as a string. we have to reconstruct it
-            path = ()
-            for p in path_s[1:-1].split(","):
-                p = p.strip(" '")
-                path += (p, )
-            if path[-1] == '':
-                path = path[:-1]
-            self.vtree_panes['active'].collapse_node(path)
+        self.restore_collapsed_tasks()
 
         self.set_view(self.config.get("view"))
 


Follow ups