From 95652b6edd7d269e9eec56a0f74dd265f80d6327 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 15 Nov 2010 13:27:19 +0100 Subject: [PATCH] Fix a bloody anoying bug with selecting a character as active, then deleting it and then spawning the char editor again --- gui/characterSelection.py | 13 +++++++++---- service/fit.py | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gui/characterSelection.py b/gui/characterSelection.py index f06e85d6b..2f17226b8 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -68,15 +68,20 @@ class CharacterSelection(wx.Panel): choice.Clear() charList = cChar.getCharacterList() cChar.getCharacterList() + picked = False + for id, name, active in charList: currId = choice.Append(name, id) if id == activeChar: choice.SetSelection(currId) - elif activeChar is None and name == "All 0": - all0 = currId + picked = True - if activeChar is None: - choice.SetSelection(all0) + if not picked: + charID = cChar.all0ID() + self.selectChar(charID) + fitID = self.mainFrame.fitMultiSwitch.getActiveFit() + cFit = service.Fit.getInstance() + cFit.changeChar(fitID, charID) if event is not None: event.Skip() diff --git a/service/fit.py b/service/fit.py index 3568a9e8c..4f7ebe2d6 100644 --- a/service/fit.py +++ b/service/fit.py @@ -417,6 +417,9 @@ class Fit(object): def changeChar(self, fitID, charID): if fitID is None or charID is None: + if charID is not None: + self.character = Character.getInstance().all0() + return fit = eos.db.getFit(fitID)