Fix crash when BuildMenus() is run with elements in the favorites menu

The-Powder-Toy · Jul 24, 2016 · fe4653c · fe4653c
1 parent 9cae1f0
commit fe4653c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
@@ -233,9 +233,11 @@ void GameModel::BuildMenus()
 		activeToolIdentifiers[3] = regularToolset[3]->GetIdentifier();
 
 	//Empty current menus
-	for(std::vector<Menu*>::iterator iter = menuList.begin(), end = menuList.end(); iter != end; ++iter)
+	for (size_t i = 0; i < menuList.size(); i++)
 	{
-		delete *iter;
+		if (i == SC_FAVORITES)
+			menuList[i]->ClearTools();
+		delete menuList[i];
 	}
 	menuList.clear();
 	toolList.clear();