Merge pull request #513 from misternebula/quick-patch

Quick patch
qsb-dev · Apr 22, 2022 · f67da6f · f67da6f
2 parents 5338531 + 102e3de
commit f67da6f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/QSB/Menus/MenuManager.cs b/QSB/Menus/MenuManager.cs
@@ -35,6 +35,7 @@ internal class MenuManager : MonoBehaviour, IAddComponentOnStart
 		private GameObject ResumeGameButton;
 		private GameObject NewGameButton;
 		private GameObject ConnectButton;
+		private float _timeIPPopupOpened;
 
 		private const int _ClientButtonIndex = 2;
 
@@ -175,7 +176,14 @@ private void CreateCommonPopups()
 		{
 			var text = QSBCore.DebugSettings.UseKcpTransport ? "Public IP Address" : "Product User ID";
 			IPPopup = MenuApi.MakeInputFieldPopup(text, text, "Connect", "Cancel");
+			IPPopup.CloseMenuOnOk(false);
 			IPPopup.OnPopupConfirm += Connect;
+			IPPopup.OnActivateMenu += () =>
+			{
+				_timeIPPopupOpened = Time.time;
+				Delay.RunFramesLater(30, () => IPPopup.CloseMenuOnOk(true));
+			};
+			IPPopup.OnDeactivateMenu += () => IPPopup.CloseMenuOnOk(false);
 
 			OneButtonInfoPopup = MenuApi.MakeInfoPopup("", "");
 			OneButtonInfoPopup.OnDeactivateMenu += OnCloseInfoPopup;
@@ -348,6 +356,13 @@ private void Host()
 
 		private void Connect()
 		{
+			if (Time.time - _timeIPPopupOpened < 0.25f)
+			{
+				return;
+			}
+
+			IPPopup.CloseMenuOnOk(false);
+
 			_intentionalDisconnect = false;
 
 			var address = ((PopupInputMenu)IPPopup).GetInputText();

diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs
@@ -1,4 +1,5 @@
-using Mirror;
+using HarmonyLib;
+using Mirror;
 using OWML.Common;
 using OWML.ModHelper;
 using QSB.Menus;
@@ -46,7 +47,9 @@ public class QSBCore : ModBehaviour
 		public static bool IsHost => NetworkServer.active;
 		public static bool IsInMultiplayer => QSBNetworkManager.singleton.isNetworkActive;
 		public static string QSBVersion => Helper.Manifest.Version;
-		public static string GameVersion => Application.version;
+		public static string GameVersion =>
+			// ignore the last patch numbers like the title screen does
+			Application.version.Split('.').Take(3).Join(delimiter: ".");
 		public static bool DLCInstalled => EntitlementsManager.IsDlcOwned() == EntitlementsManager.AsyncOwnershipStatus.Owned;
 		public static IMenuAPI MenuApi { get; private set; }
 		public static DebugSettings DebugSettings { get; private set; } = new();

diff --git a/QSB/manifest.json b/QSB/manifest.json
@@ -7,7 +7,7 @@
 		"body": "- Disable *all* other mods. (Can heavily affect performance)\n- Make sure you are not running any other network-intensive applications.\n- Make sure you have forwarded/opened the correct ports. (See the GitHub readme.)"
 	},
 	"uniqueName": "Raicuparta.QuantumSpaceBuddies",
-	"version": "0.17.1",
+	"version": "0.17.2",
 	"owmlVersion": "2.3.2",
 	"dependencies": [ "_nebula.MenuFramework" ]
 }