From de9b167242311d95815bdc0591065809895bd909 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Wed, 10 May 2017 18:48:33 -0400 Subject: [PATCH] Bump version and include fix for #1147 (#1150) * bump dev * Fix two issues with deleting fits (#1147) --- config.py | 4 ++-- gui/shipBrowser.py | 2 +- service/fit.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index fe711ef11..56948323b 100644 --- a/config.py +++ b/config.py @@ -19,8 +19,8 @@ debug = False saveInRoot = False # Version data -version = "1.29.0" -tag = "Stable" +version = "1.29.1" +tag = "git" expansionName = "YC119.5" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 75a1548ce..60c03153c 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -2001,7 +2001,7 @@ class FitItem(SFItem.SFBrowserItem): def Refresh(self): activeFit = self.mainFrame.getActiveFit() - if activeFit == self.fitID: + if activeFit == self.fitID and not self.deleted: sFit = Fit.getInstance() fit = sFit.getFit(activeFit) self.timestamp = fit.modifiedCoalesce diff --git a/service/fit.py b/service/fit.py index e74e0b108..fed6b3349 100644 --- a/service/fit.py +++ b/service/fit.py @@ -198,8 +198,9 @@ class Fit(object): @staticmethod def editNotes(fitID, notes): fit = eos.db.getFit(fitID) - fit.notes = notes - eos.db.commit() + if fit: + fit.notes = notes + eos.db.commit() def toggleFactorReload(self, fitID): pyfalog.debug("Toggling factor reload for fit ID: {0}", fitID)