diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp index 542d5f832..a32219294 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/cockatrice/src/client/tabs/tab_supervisor.cpp @@ -101,7 +101,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/) TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent) : QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr), tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr), tabReplays(nullptr), tabAdmin(nullptr), - tabLog(nullptr), isLocalGame(false), isReopeningTabs(false) + tabLog(nullptr), isLocalGame(false) { setElideMode(Qt::ElideRight); setMovable(true); @@ -285,13 +285,9 @@ void TabSupervisor::initStartupTabs() { addDeckEditorTab(nullptr); - isReopeningTabs = true; - checkAndTrigger(aTabVisualDeckStorage, SettingsCache::instance().getTabVisualDeckStorageOpen()); checkAndTrigger(aTabDeckStorage, SettingsCache::instance().getTabDeckStorageOpen()); checkAndTrigger(aTabReplays, SettingsCache::instance().getTabReplaysOpen()); - - isReopeningTabs = false; } /** @@ -365,8 +361,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo) resetTabsMenu(); - isReopeningTabs = true; - tabsMenu->addSeparator(); tabsMenu->addAction(aTabServer); tabsMenu->addAction(aTabAccount); @@ -385,8 +379,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo) checkAndTrigger(aTabLog, SettingsCache::instance().getTabLogOpen()); } - isReopeningTabs = false; - retranslateUi(); } diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h index 5b1a93dad..0b6b95698 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/client/tabs/tab_supervisor.h @@ -90,11 +90,6 @@ private: QList deckEditorTabs; bool isLocalGame; - /** - * Whether we're in the middle of reopening tabs that have their open state persisted in the settings. - */ - bool isReopeningTabs; - QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog;