From a336068d98b6d0c9d16f484224bb455d5a13a6a8 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sat, 11 Sep 2010 20:26:30 +0200 Subject: [PATCH] Don't do anything if we dun have to, LETS BE LAZY! --- controller/fit.py | 3 +++ gui/fittingView.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/controller/fit.py b/controller/fit.py index 0c01ad009..ec129beab 100644 --- a/controller/fit.py +++ b/controller/fit.py @@ -90,6 +90,9 @@ class Fit(object): def removeModule(self, fitID, position): fit = eos.db.getFit(fitID) + if fit.modules[position].isEmpty: + return False + fit.modules.toDummy(position) eos.db.commit() fit.clear() diff --git a/gui/fittingView.py b/gui/fittingView.py index 905948af8..318e5762b 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -64,9 +64,10 @@ class FittingView(d.Display): row, _ = self.HitTest(event.Position) if row != -1: cFit = controller.Fit.getInstance() - cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position) + trigger = cFit.removeModule(self.activeFitID, self.mods[self.GetItemData(row)].position) - wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID)) + if trigger: + wx.PostEvent(self.mainFrame, FitChanged(fitID=self.activeFitID)) def fitChanged(self, event): cFit = controller.Fit.getInstance()