Merge branch '1.5' into dotnet7

# Conflicts: # Source/Editor/Managed/ManagedEditor.Internal.cpp # Source/Engine/Core/Config/LayersAndTagsSettings.cs
2022-12-28 18:49:14 +01:00
parent aa0208072c 6f545beffe
commit c48a81a068
97 changed files with 1945 additions and 421 deletions
--- a/Source/Engine/Networking/NetworkManager.cpp
+++ b/Source/Engine/Networking/NetworkManager.cpp
@@ -326,10 +326,14 @@ void NetworkManager::Stop()
        Delete(client);
        Clients.RemoveAt(i);
    }
+    if (Mode == NetworkManagerMode::Host && LocalClient)
+    {
+        ClientDisconnected(LocalClient);
+        LocalClient->State = NetworkConnectionState::Disconnected;
+    }
    StopPeer();
    if (LocalClient)
    {
-        LocalClient->State = NetworkConnectionState::Disconnected;
        Delete(LocalClient);
        LocalClient = nullptr;
    }