making sure reconnection popup is closed when successful or cancelled

Author: LPLafontaineB

Assets/BossRoom/Scripts/Client/UI/ConnectionStatusMessageUIManager.cs

@@ -42,7 +42,6 @@ void OnConnectStatus(ConnectStatus status)
                     PopupManager.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
                     break;
                 case ConnectStatus.Success:
-                    CloseReconnectPopup();
                     break;
                 case ConnectStatus.LoggedInAgain:
                     PopupManager.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ClientGameNetPortal.cs

@@ -107,6 +107,7 @@ public void OnUserDisconnectRequest()
                 {
                     StopCoroutine(m_TryToReconnectCoroutine);
                     m_TryToReconnectCoroutine = null;
+                    m_ReconnectMessagePub.Publish(new ReconnectMessage(k_NbReconnectAttempts, k_NbReconnectAttempts));
                 }
                 // If we are the server, shutdown will be handled by ServerGameNetPortal
                 if (!m_Portal.NetManager.IsServer)
@@ -133,6 +134,7 @@ public void OnConnectFinished(ConnectStatus status)
                 {
                     StopCoroutine(m_TryToReconnectCoroutine);
                     m_TryToReconnectCoroutine = null;
+                    m_ReconnectMessagePub.Publish(new ReconnectMessage(k_NbReconnectAttempts, k_NbReconnectAttempts));
                 }
                 m_ConnectStatusPub.Publish(status);
                 if (m_LobbyServiceFacade.CurrentUnityLobby != null)
@@ -229,13 +231,7 @@ private IEnumerator TryToReconnect(string lobbyCode)
 
             // If the coroutine has not been stopped before this, it means we failed to connect during all attempts
             Debug.Log("All tries failed, returning to main menu");
-            m_LobbyServiceFacade.EndTracking();
-            if (NetworkManager.Singleton.IsListening)
-            {
-                NetworkManager.Singleton.Shutdown();
-            }
-
-            SceneLoaderWrapper.Instance.LoadScene("MainMenu");
+            m_ApplicationController.LeaveSession(false);
             if (!DisconnectReason.HasTransitionReason)
             {
                 DisconnectReason.SetDisconnectReason(ConnectStatus.GenericDisconnect);