diff --git a/gui/crestFittings.py b/gui/crestFittings.py index 44e488cd9..c5ee71029 100644 --- a/gui/crestFittings.py +++ b/gui/crestFittings.py @@ -236,10 +236,7 @@ class ExportToEve(wx.Frame): event.Skip() def ssoLogout(self, event): - if event.type == CrestModes.IMPLICIT: - self.Close() - else: - self.updateCharList() + self.updateCharList() event.Skip() # continue event def OnClose(self, event): diff --git a/gui/mainFrame.py b/gui/mainFrame.py index b36f9b4ce..44523ae5a 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -614,22 +614,13 @@ class MainFrame(wx.Frame): menu.Enable(menu.exportToEveId, True) def updateCrestMenus(self, type): - # in case we are logged in when switching, change title back - self.titleTimer.Stop() - self.SetTitle(self.title) - menu = self.GetMenuBar() sCrest = Esi.getInstance() - if type == CrestModes.IMPLICIT: - menu.SetLabel(menu.ssoLoginId, "Login to EVE") - menu.Enable(menu.eveFittingsId, False) - menu.Enable(menu.exportToEveId, False) - else: - menu.SetLabel(menu.ssoLoginId, "Manage Characters") - enable = len(sCrest.getSsoCharacters()) == 0 - menu.Enable(menu.eveFittingsId, not enable) - menu.Enable(menu.exportToEveId, not enable) + menu.SetLabel(menu.ssoLoginId, "Manage Characters") + enable = len(sCrest.getSsoCharacters()) == 0 + menu.Enable(menu.eveFittingsId, not enable) + menu.Enable(menu.exportToEveId, not enable) def ssoHandler(self, event): dlg = CrestMgmt(self)