PHXH
/
UniTask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support disable domain reload 

When domain reload is disabled, re-initialization is required when entering play mode; otherwise, pending tasks will leak between play mode sessions.
master
Artyom Sovetnikov 2020-02-18 17:06:19 +03:00
parent 50ba93f951
commit ecd678117e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/UniRx.Async/PlayerLoopHelper.cs
View File

@ -96,8 +96,10 @@ namespace UniRx.Async
#endif #endif
}; };
var dest = new PlayerLoopSystem[loopSystem.subSystemList.Length + 2]; var source = loopSystem.subSystemList // Remove items form previous initializations.
Array.Copy(loopSystem.subSystemList, 0, dest, 2, loopSystem.subSystemList.Length); .Where(ls => ls.type != loopRunnerYieldType && ls.type != loopRunnerType).ToArray();
var dest = new PlayerLoopSystem[source.Length + 2];
Array.Copy(source, 0, dest, 2, source.Length);
dest[0] = yieldLoop; dest[0] = yieldLoop;
dest[1] = runnerLoop; dest[1] = runnerLoop;
return dest; return dest;
@ -110,7 +112,15 @@ namespace UniRx.Async
unitySynchronizationContetext = SynchronizationContext.Current; unitySynchronizationContetext = SynchronizationContext.Current;
mainThreadId = Thread.CurrentThread.ManagedThreadId; mainThreadId = Thread.CurrentThread.ManagedThreadId;
#if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
// When domain reload is disabled, re-initialization is required when entering play mode;
// otherwise, pending tasks will leak between play mode sessions.
var domainReloadDisabled = UnityEditor.EditorSettings.enterPlayModeOptionsEnabled &&
UnityEditor.EditorSettings.enterPlayModeOptions.HasFlag(UnityEditor.EnterPlayModeOptions.DisableDomainReload);
if (!domainReloadDisabled && runners != null) return;
#else
if (runners != null) return; // already initialized if (runners != null) return; // already initialized
#endif
var playerLoop = var playerLoop =
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER