Fix issue with MultiClient not sending disconnect event

Extra-2-Dew · Jul 20, 2024 · cbf0e7e · cbf0e7e
1 parent 9b1adec
commit cbf0e7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Code/APHandler.cs b/Code/APHandler.cs
@@ -76,6 +76,7 @@ public void Disconnect()
 				return;
 
 			Session.Socket.Disconnect();
+			OnDisconnected("Manual disconnection");
 		}
 
 		public void LocationChecked(int offset)

diff --git a/Code/APMenuStuff.cs b/Code/APMenuStuff.cs
@@ -81,14 +81,10 @@ private void OnEnable()
 
 			APHandler.Instance.OnDisconnect += () =>
 			{
-				ToggleAPConnectedIcon(false);
+				if (apButtonActiveImageObj != null)
+					ToggleAPConnectedIcon(false);
+
 				Plugin.Instance.SetAPFileData(null);
-				MessageBoxHandler.MessageData messageData = new()
-				{
-					Message = "You lost connection with the Archipelago server!"
-				};
-				MessageBoxHandler.Instance.ShowMessageBox(messageData);
-				Plugin.Log.LogInfo("TEST: DISCONNECTED!");
 			};
 
 			ToggleAPConnectedIcon(false);
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ public void Disconnect() @@
     				return;
     			Session.Socket.Disconnect();
+    			OnDisconnected("Manual disconnection");
     		}
     		public void LocationChecked(int offset)
@@ Expand Down @@