fixing user-requested shutdown

(cherry picked from commit 2accfe4)

Author: LPLafontaineB

Assets/Scripts/ApplicationLifecycle/ApplicationController.cs

@@ -143,11 +143,7 @@ private void LeaveSession(QuitGameSessionMessage msg)
             if (msg.UserRequested)
             {
                 // first disconnect then return to menu
-                var gameNetPortal = GameNetPortal.Instance;
-                if (gameNetPortal != null)
-                {
-                    gameNetPortal.RequestDisconnect();
-                }
+                m_ConnectionManager.RequestShutdown();
             }
             SceneLoaderWrapper.Instance.LoadScene("MainMenu", useNetworkSceneManager: false);
         }

Assets/Scripts/Gameplay/ConnectionManagement/ConnectionManager.cs

@@ -155,6 +155,7 @@ public bool StartHostIp(string playerName, string ipaddress, int port)
 
         public void RequestShutdown()
         {
+            DisconnectReason.SetDisconnectReason(ConnectStatus.UserRequestedDisconnect);
             m_Logics[m_CurrentState].OnUserRequestedShutdown();
         }
 

Assets/Scripts/Gameplay/ConnectionManagement/ConnectionState/ConnectedConnectionState.cs

@@ -35,6 +35,7 @@ public override void OnClientDisconnect(ulong clientId)
                     case ConnectStatus.UserRequestedDisconnect:
                     case ConnectStatus.HostEndedSession:
                         m_QuitGameSessionPublisher.Publish(new QuitGameSessionMessage() {UserRequested = false}); // go through the normal leave flow
+                        m_ConnectionManager.ChangeState(ConnectionStateType.Offline);
                         break;
                     default:
                         // try reconnecting
@@ -46,5 +47,11 @@ public override void OnClientDisconnect(ulong clientId)
                 m_ConnectionManager.DisconnectReason.Clear();
             }
         }
+
+        public override void OnUserRequestedShutdown()
+        {
+            m_ConnectionManager.NetworkManager.Shutdown();
+            m_ConnectionManager.ChangeState(ConnectionStateType.Offline);
+        }
     }
 }