Skip to content

fix: network manager does not clean up if exception is thrown while starting #3864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
NoelStephensUnity wants to merge 1 commit into
base: develop-2.0.0
Choose a base branch
from
Draft

fix: network manager does not clean up if exception is thrown while starting #3864

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 39 additions & 5 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,7 +1323,17 @@ public bool StartServer()
}
ConnectionManager.LocalClient.ClientId = ServerClientId;

Initialize(true);
try
{
Initialize(true);
}
catch (Exception ex)
{
Debug.LogException(ex);
// Always shutdown to assure everything is cleaned up
ShutdownInternal();
return false;
}

try
{
Expand All @@ -1342,11 +1352,13 @@ public bool StartServer()

ConnectionManager.TransportFailureEventHandler(true);
}
catch (Exception)
catch (Exception ex)
{
Debug.LogException(ex);
// Always shutdown to assure everything is cleaned up
ShutdownInternal();
ConnectionManager.LocalClient.SetRole(false, false);
IsListening = false;
throw;
}

return IsListening;
Expand All @@ -1373,7 +1385,16 @@ public bool StartClient()
return false;
}

Initialize(false);
try
{
Initialize(false);
}
catch (Exception ex)
{
Debug.LogException(ex);
ShutdownInternal();
return false;
}

try
{
Expand Down Expand Up @@ -1419,7 +1440,18 @@ public bool StartHost()
return false;
}

Initialize(true);
try
{
Initialize(true);
}
catch (Exception ex)
{
Debug.LogException(ex);
// Always shutdown to assure everything is cleaned up
ShutdownInternal();
return false;
}

try
{
IsListening = NetworkConfig.NetworkTransport.StartServer();
Expand All @@ -1437,6 +1469,8 @@ public bool StartHost()
catch (Exception ex)
{
Debug.LogException(ex);
// Always shutdown to assure everything is cleaned up
ShutdownInternal();
ConnectionManager.LocalClient.SetRole(false, false);
IsListening = false;
}
Expand Down