From 9cd84eccde7baff9a3a4627dd03ade3f8b72d479 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 16 May 2013 21:59:40 -0400
Subject: [PATCH] fix tpt.selectedl sometimes being incorrect

---
 src/gui/game/GameController.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp
index 267133b9f..e98086a7d 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()