Close debug menu whenever screen is changed

src/guiengine/abstract_state_manager.cpp

@@ -24,6 +24,7 @@
 #include "guiengine/screen_keyboard.hpp"
 #include "guiengine/screen.hpp"
 #include "input/device_manager.hpp"
+#include "utils/debug.hpp"
 
 #include <vector>
 #include <iostream>
@@ -55,6 +56,8 @@ void AbstractStateManager::enterGameState()
     if (getCurrentScreen() != NULL) getCurrentScreen()->tearDown();
     m_menu_stack.clear();
     m_menu_stack.emplace_back(RACE_STATE_NAME, (Screen*)NULL);
+
+    Debug::closeDebugMenu();
     setGameState(GAME);
     GUIEngine::cleanForGame();
 }   // enterGameState

src/guiengine/engine.cpp

@@ -683,6 +683,7 @@ namespace GUIEngine
 #include "modes/cutscene_world.hpp"
 #include "modes/world.hpp"
 #include "states_screens/race_gui_base.hpp"
+#include "utils/debug.hpp"
 
 #include <iostream>
 #include <assert.h>
@@ -911,6 +912,7 @@ namespace GUIEngine
             return;
         }
 
+        Debug::closeDebugMenu();
         g_current_screen->beforeAddingWidget();
 
         // show screen

src/utils/debug.cpp

@@ -1098,4 +1098,12 @@ bool isOpen()
     return g_debug_menu_visible;
 }   // isOpen
 
+// ----------------------------------------------------------------------------
+/** Close the debug menu.
+ */
+void closeDebugMenu()
+{
+    g_debug_menu_visible = false;
+}   // closeDebugMenu
+
 }  // namespace Debug

src/utils/debug.hpp

@@ -27,6 +27,7 @@ namespace Debug
 {
     bool onEvent(const irr::SEvent &event);
     bool isOpen();
+    void closeDebugMenu();
     bool handleStaticAction(int key);
 }