🐛 Fixed menu not appearing after exiting simulation

RigsOfRods · Feb 14, 2021 · dd827ff · dd827ff
1 parent a22eed3
commit dd827ff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/source/main/gui/panels/GUI_GamePauseMenu.cpp b/source/main/gui/panels/GUI_GamePauseMenu.cpp
@@ -94,6 +94,7 @@ void GamePauseMenu::Draw() // TODO: Copypaste of 'GameMainMenu' -- cleanup and u
             {
                 App::GetGameContext()->PushMessage(Message(MSG_NET_DISCONNECT_REQUESTED));
             }
+            App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
         }
 
         if (HighlightButton(_L("Exit game"), btn_size, 2))

diff --git a/source/main/gui/panels/GUI_TopMenubar.cpp b/source/main/gui/panels/GUI_TopMenubar.cpp
@@ -256,6 +256,7 @@ void TopMenubar::Update()
                     App::GetGameContext()->PushMessage(Message(MSG_NET_DISCONNECT_REQUESTED));
                 }
                 App::GetGameContext()->PushMessage(Message(MSG_SIM_UNLOAD_TERRN_REQUESTED));
+                App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
             }
 
             if (ImGui::Button(_LC("TopMenubar", "Exit")))

diff --git a/source/main/main.cpp b/source/main/main.cpp
@@ -380,13 +380,15 @@ int main(int argc, char *argv[])
                 case MSG_NET_SERVER_KICK:
                     App::GetGameContext()->PushMessage(Message(MSG_NET_DISCONNECT_REQUESTED));
                     App::GetGameContext()->PushMessage(Message(MSG_SIM_UNLOAD_TERRN_REQUESTED));
+                    App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
                     App::GetGuiManager()->ShowMessageBox(
                         _LC("Network", "Network disconnected"), m.description.c_str());
                     break;
 
                 case MSG_NET_RECV_ERROR:
                     App::GetGameContext()->PushMessage(Message(MSG_NET_DISCONNECT_REQUESTED));
                     App::GetGameContext()->PushMessage(Message(MSG_SIM_UNLOAD_TERRN_REQUESTED));
+                    App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
                     App::GetGuiManager()->ShowMessageBox(
                         _L("Network fatal error: "), m.description.c_str());
                     break;

diff --git a/source/main/scripting/GameScript.cpp b/source/main/scripting/GameScript.cpp
@@ -930,6 +930,7 @@ void GameScript::showMessageBox(Ogre::String& title, Ogre::String& text, bool us
 void GameScript::backToMenu()
 {
     App::GetGameContext()->PushMessage(Message(MSG_SIM_UNLOAD_TERRN_REQUESTED));
+    App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
 }
 
 void GameScript::quitGame()
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     App::GetGameContext()->PushMessage(Message(MSG_NET_DISCONNECT_REQUESTED));
                 }
+                App::GetGameContext()->PushMessage(Message(MSG_GUI_OPEN_MENU_REQUESTED));
             }
             if (HighlightButton(_L("Exit game"), btn_size, 2))
@@ Expand Down @@