Fixed: Potential Exception after Application with Server Quits

Reloaded-Project · Nov 6, 2022 · 457b74f · 457b74f
1 parent 76e8c49
commit 457b74f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/source/Reloaded.Mod.Launcher.Lib/Models/ViewModel/Application/ReloadedAppViewModel.cs b/source/Reloaded.Mod.Launcher.Lib/Models/ViewModel/Application/ReloadedAppViewModel.cs
@@ -42,11 +42,11 @@ public ReloadedAppViewModel(ApplicationViewModel applicationViewModel)
         ApplicationViewModel.SelectedProcess.Exited += SelectedProcessOnExited;
 
         /* Try establish connection. */
-        if (!TryGetPort(out _port)) 
+        if (!TryGetPort(true, out _port)) 
             return;
 
         Client = new LiteNetLibClient(IPAddress.Loopback, "", _port, true);
-        Client.OnTryReconnect += (peer) => TryGetPort(out _port);
+        Client.OnTryReconnect += (peer) => TryGetPort(false, out _port);
         Client.OverrideDetailsOnReconnect += () => (null, _port);
         Client.OnReceiveException += ClientOnReceiveException;
 
@@ -60,7 +60,7 @@ public ReloadedAppViewModel(ApplicationViewModel applicationViewModel)
         _refreshTimer.Enabled = true;
     }
 
-    private bool TryGetPort(out int port)
+    private bool TryGetPort(bool throwOnFailure, out int port)
     {
         try
         {
@@ -70,7 +70,9 @@ private bool TryGetPort(out int port)
         catch (Exception ex)
         {
             port = -1;
-            Errors.HandleException(new Exception(Resources.ErrorFailedToObtainPort.Get(), ex));
+            if (throwOnFailure)
+                Errors.HandleException(new Exception(Resources.ErrorFailedToObtainPort.Get(), ex));
+
             return false;
         }
     }