From 7b8bb79cbe0c0cad0c6c580de7fb08e54eb00342 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 3 Feb 2015 15:23:31 -0500 Subject: [PATCH] Fix error when loading previous fits that no longer exist in DB --- gui/mainFrame.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 84e024f35..b50ed9867 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -204,9 +204,18 @@ class MainFrame(wx.Frame): dlg.Destroy() def LoadPreviousOpenFits(self): + sFit = service.Fit.getInstance() + self.prevOpenFits = service.SettingsProvider.getInstance().getSettings("pyfaPrevOpenFits", {"enabled": False, "pyfaOpenFits": []}) fits = self.prevOpenFits['pyfaOpenFits'] + # Remove any fits that cause exception when fetching (non-existent fits) + for id in fits[:]: + try: + sFit.getFit(id) + except: + fits.remove(id) + if not self.prevOpenFits['enabled'] or len(fits) is 0: # add blank page if there are no fits to be loaded self.fitMultiSwitch.AddPage()