From 4d158d99fd3797eb4989317686842b2e5f1127ed Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 5 Jul 2016 23:23:55 -0400 Subject: [PATCH] Fix crash related to structure rigs not having meta level, and a traceback that might happen occasionally. --- gui/builtinContextMenus/metaSwap.py | 1 + gui/chromeTabs.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/metaSwap.py index 0d04bc710..0b2d847ac 100644 --- a/gui/builtinContextMenus/metaSwap.py +++ b/gui/builtinContextMenus/metaSwap.py @@ -41,6 +41,7 @@ class MetaSwap(ContextMenu): self.moduleLookup = {} def get_metalevel(x): + if "metaLevel" not in x.attributes: return 0 return x.attributes["metaLevel"].value def get_metagroup(x): diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index 485d82a55..bfc3adeb4 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -231,8 +231,11 @@ class PFNotebook(wx.Panel): idx = self.GetPageIndex(page) if toggle and page == self.activePage: - # Set page to the first non-disabled page - self.SetSelection(next(i for i, _ in enumerate(self.pages) if not self.tabsContainer.tabs[i].disabled)) + try: + # Set page to the first non-disabled page + self.SetSelection(next(i for i, _ in enumerate(self.pages) if not self.tabsContainer.tabs[i].disabled)) + except StopIteration, ex: + self.SetSelection(0) self.tabsContainer.DisableTab(idx, toggle)