Skip to content

reverse order of setUnityInstance and quitUnityInstance #213

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

Merged
merged 1 commit into from
Jul 24, 2021
Merged

reverse order of setUnityInstance and quitUnityInstance #213

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
6 changes: 4 additions & 2 deletions source/components/unity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,16 @@ export class Unity extends PureComponent<IUnityProps, {}> {
_unityInstanceParameters,
this.onProgress.bind(this)
);
// Finally pass the instance back to the context object.
this.unityContext.setUnityInstance(_unityInstance);
// Since the creation of the Unity Instance is async, we'll check the
// component's mount state right aftater instantiating. If the component
// is no longer mounted, we'll quit the Unity instance right away.
// This needs to occur after the setUnityInstance call because
// quitUnityInstance requires the instance to be set.
// HACK requires type cast to boolean due to await between comparisons.
if ((this.isComponentMounted as boolean) === false)
return this.unityContext.quitUnityInstance();
// Finally pass the instance back to the context object.
this.unityContext.setUnityInstance(_unityInstance);
} catch (message) {
this.unityContext.dispatchEventListener("error", message);
console.error("A problem occurred while mounting", message);
Expand Down