summaryrefslogtreecommitdiff
path: root/src/gui/game/GameController.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-17 01:59:40 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-17 01:59:40 (GMT)
commit9cd84eccde7baff9a3a4627dd03ade3f8b72d479 (patch)
treef94fe71feedfdce01c0a2b376c64a9bf97e2fc74 /src/gui/game/GameController.cpp
parent7b6ded50dca6df5dfe2b22eb47de966e02878284 (diff)
downloadpowder-9cd84eccde7baff9a3a4627dd03ade3f8b72d479.zip
powder-9cd84eccde7baff9a3a4627dd03ade3f8b72d479.tar.gz
fix tpt.selectedl sometimes being incorrect
Diffstat (limited to 'src/gui/game/GameController.cpp')
-rw-r--r--src/gui/game/GameController.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index 267133b..e98086a 100644
--- a/src/gui/game/GameController.cpp
+++ b/src/gui/game/GameController.cpp
@@ -947,14 +947,15 @@ void GameController::SetActiveMenu(int menuID)
{
gameModel->SetActiveMenu(menuID);
vector<Menu*> menuList = gameModel->GetMenuList();
- bool set = false;
if(menuID == SC_DECO)
- {
gameModel->SetColourSelectorVisibility(true);
- set = true;
- }
- if(!set)
+ else
+ {
gameModel->SetColourSelectorVisibility(false);
+ ActiveToolChanged(0, gameModel->GetActiveTool(0));
+ ActiveToolChanged(1, gameModel->GetActiveTool(1));
+ ActiveToolChanged(2, gameModel->GetActiveTool(2));
+ }
}
std::vector<Menu*> GameController::GetMenuList()