v0.13.0.11

2021-04-22 17:33:08 +03:00
parent 0697d7fc64
commit 8bb31f2893
391 changed files with 17271 additions and 5949 deletions
@@ -24,6 +24,7 @@
            {
                selected.Deselect();
 #if CLIENT
+                GUIContextMenu.CurrentContextMenu = null;
                GUI.ClearCursorWait();
                //make sure any textbox in the previously selected screen doesn't stay selected
                if (GUI.KeyboardDispatcher.Subscriber != DebugConsole.TextBox)
@@ -31,6 +32,13 @@
                    GUI.KeyboardDispatcher.Subscriber = null;
                    GUI.ScreenChanged = true;
                }
+                SubmarinePreview.Close();
+
+                // Make sure the saving indicator is disabled when returning to main menu or lobby
+                if (this == GameMain.MainMenuScreen || this == GameMain.NetLobbyScreen)
+                {
+                    GUI.DisableSavingIndicatorDelayed();
+                }
 #endif
            }
            selected = this;