charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Don't call FinishLoadScene when customHandling (#2794)

Browse Source 
* fix: Don't call FinishLoadScene when customHandling
FinishLoadScene will be called from `UpdateScene`  if `loadingSceneAsync != null && loadingSceneAsync.isDone` and it's the responsibility of the user in their custom handler to assign `loadingSceneAsync` to something to block FinishLoadScene until that completes.

* Update Assets/Mirror/Runtime/NetworkManager.cs

Co-authored-by: vis2k <info@noobtuts.com>
This commit is contained in:
MrGadget 2021-06-22 01:29:49 -04:00 committed by GitHub
parent ae05d10903
commit 92334ba2aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Mirror/Runtime/NetworkManager.cs
View File

@ -800,11 +800,11 @@ internal void ClientChangeScene(string newSceneName, SceneOperation sceneOperati
OnClientChangeScene(newSceneName, sceneOperation, customHandling); OnClientChangeScene(newSceneName, sceneOperation, customHandling);
// scene handling will happen in overrides of OnClientChangeScene and/or OnClientSceneChanged // scene handling will happen in overrides of OnClientChangeScene and/or OnClientSceneChanged
// Do not call FinishLoadScene here. Custom handler will assign loadingSceneAsync and we need
// to wait for that to finish. UpdateScene already checks for that to be not null and isDone.
// (in other words, custom loading needs to call FinishLoadScene when they are done)
if (customHandling) if (customHandling)
{
FinishLoadScene();
return; return;
}
switch (sceneOperation) switch (sceneOperation)
{ {