From: Mason Larobina <mason.larobina@gmail.com>
Date: Wed, 22 Jul 2009 05:48:51 +0000 (+0800)
Subject: bugfix: uzbl_tabbed.py crashed when loading old format session file
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=977eef6d10d762bf8ba517eecef1eca8c89f8704;p=uzbl-mobile

bugfix: uzbl_tabbed.py crashed when loading old format session file
---

diff --git a/examples/data/uzbl/scripts/uzbl_tabbed.py b/examples/data/uzbl/scripts/uzbl_tabbed.py
index 8de3006..5742494 100755
--- a/examples/data/uzbl/scripts/uzbl_tabbed.py
+++ b/examples/data/uzbl/scripts/uzbl_tabbed.py
@@ -1185,15 +1185,20 @@ class UzblTabbed:
                 error("Warning: The non-json session file %r looks invalid."\
                   % session_file)
                 return None
-                
-            for line in lines:
-                if line.startswith("curtab"):
-                    curtab = int(line.split()[-1])
+            
+            try:
+                for line in lines:
+                    if line.startswith("curtab"):
+                        curtab = int(line.split()[-1])
 
                 else:
                     uri, title = line.split("\t",1)
                     tabs += [(strip(uri), strip(title)),]
 
+            except:
+                error("Warning: failed to load session file %r" % session_file)
+                return None
+
             session = {'curtab': curtab, 'tabs': tabs}
         
         # Now populate notebook with the loaded session.