Merge pull request #494 from jonasdn/jonasdn/tabs

Handle tabs from config better
bitcraze · Mar 25, 2021 · 174003f · 174003f
2 parents 5006b3d + 5d00e39
commit 174003f
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/cfclient/ui/main.py b/src/cfclient/ui/main.py
@@ -278,12 +278,15 @@ def __init__(self, *args):
         # First instantiate all tabs and then open them in the correct order
         try:
             for tName in Config().get("open_tabs").split(","):
-                t = tabItems[tName]
-                if (t is not None and t.isEnabled()):
-                    # Toggle though menu so it's also marked as open there
-                    t.toggle()
-        except Exception as e:
-            logger.warning("Exception while opening tabs [{}]".format(e))
+                try:
+                    t = tabItems[tName]
+                    if (t is not None and t.isEnabled()):
+                        # Toggle though menu so it's also marked as open there
+                        t.toggle()
+                except Exception as e:
+                    logger.warning("Exception while opening tab [{}]".format(e))
+        except KeyError as e:
+            logger.warning("Failed to get open_tabs: {}".format(e))
 
         # Loading toolboxes (A bit of magic for a lot of automatic)
         self.toolboxesMenuItem = QMenu("Toolboxes", self.menuView,