From ffe840e245a5d924b06c90912411ca183625591e Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 13 May 2017 22:46:36 -0400 Subject: [PATCH] Fix for #1161. Can't reproduce, but I'm unsure what the root cause is (probably something firing in the wrong order). 9be4ae may also alleviate the root cause. --- gui/shipBrowser.py | 7 ++++--- service/fit.py | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 95819a434..7570b2aa5 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -2006,9 +2006,10 @@ class FitItem(SFItem.SFBrowserItem): if activeFit == self.fitID and not self.deleted: sFit = Fit.getInstance() fit = sFit.getFit(activeFit) - self.timestamp = fit.modifiedCoalesce - self.notes = fit.notes - self.__setToolTip() + if fit is not None: # sometimes happens when deleting fits, dunno why. + self.timestamp = fit.modifiedCoalesce + self.notes = fit.notes + self.__setToolTip() SFItem.SFBrowserItem.Refresh(self) diff --git a/service/fit.py b/service/fit.py index a905c7767..9c66e1f9a 100644 --- a/service/fit.py +++ b/service/fit.py @@ -257,6 +257,9 @@ class Fit(object): return None fit = eos.db.getFit(fitID) + if fit is None: + return None + if basic: return fit