Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Application.quitting instead of MonoBehaviour.OnApplicationQuit #463

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Application.quitting instead of MonoBehaviour.OnApplicationQuit #463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0026364
Application.quitting instead of MonoBehaviour.OnApplicationQuit
Cluster7ck Jun 24, 2020
833edd1
Merge pull request #1 from Cluster7ck/application-quit-patch
Cluster7ck Jun 24, 2020
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
10 changes: 6 additions & 4 deletions Assets/Plugins/UniRx/Scripts/UnityEngineBridge/MainThreadDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,9 @@ void Awake()
updateMicroCoroutine = new MicroCoroutine(ex => unhandledExceptionCallback(ex));
fixedUpdateMicroCoroutine = new MicroCoroutine(ex => unhandledExceptionCallback(ex));
endOfFrameMicroCoroutine = new MicroCoroutine(ex => unhandledExceptionCallback(ex));


Application.quitting += OnApplicationQuitting;

StartCoroutine(RunUpdateMicroCoroutine());
StartCoroutine(RunFixedUpdateMicroCoroutine());
StartCoroutine(RunEndOfFrameMicroCoroutine());
Expand Down Expand Up @@ -590,7 +592,7 @@ void OnDestroy()
{
instance = GameObject.FindObjectOfType<MainThreadDispatcher>();
initialized = instance != null;

Application.quitting -= OnApplicationQuitting;
/*
// Although `this` still refers to a gameObject, it won't be found.
var foundDispatcher = GameObject.FindObjectOfType<MainThreadDispatcher>();
Expand Down Expand Up @@ -669,7 +671,7 @@ public static IObservable<bool> OnApplicationPauseAsObservable()

Subject<Unit> onApplicationQuit;

void OnApplicationQuit()
void OnApplicationQuitting()
{
isQuitting = true;
if (onApplicationQuit != null) onApplicationQuit.OnNext(Unit.Default);
Expand All @@ -680,4 +682,4 @@ public static IObservable<Unit> OnApplicationQuitAsObservable()
return Instance.onApplicationQuit ?? (Instance.onApplicationQuit = new Subject<Unit>());
}
}
}
}