Commit 74d7d4a

committed

Close the native library when the editor state changes back to edit mode rather than in OnApplicationQuit, which can be called before other MonoBehaviour messages like OnDestroy.

1 parent efcc949 commit 74d7d4aCopy full SHA for 74d7d4a

File tree

1 file changed

+15

-4

lines changed

Unity/Assets/NativeScript
- BootScript.cs

1 file changed

+15

-4

lines changed

`‎Unity/Assets/NativeScript/BootScript.cs`

Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using System;`
	`2`	`+using UnityEditor;`
`1`	`3`	`using UnityEngine;`
`2`	`4`
`3`	`5`	`namespace NativeScript`
`@@ -25,6 +27,7 @@ public class BootScript : MonoBehaviour`
`25`	`27`	`public float AutoReloadPollTime = 1.0f;`
`26`	`28`	`private float lastAutoReloadPollTime;`
`27`	`29`	`private Coroutine autoReloadCoroutine;`
	`30`	`+ private Action<PlayModeStateChange> onPlayModeStateChange;`
`28`	`31`	`#endif`
`29`	`32`
`30`	`33`	`void Start()`
`@@ -34,6 +37,10 @@ void Start()`
`34`	`37`	`#endif`
`35`	`38`	`DontDestroyOnLoad(gameObject);`
`36`	`39`	`Bindings.Open(MemorySize);`
	`40`	`+#if UNITY_EDITOR`
	`41`	`+ onPlayModeStateChange = OnEditorStateChanged;`
	`42`	`+ EditorApplication.playModeStateChanged += onPlayModeStateChange;`
	`43`	`+#endif`
`37`	`44`	`}`
`38`	`45`
`39`	`46`	`#if UNITY_EDITOR`
`@@ -74,11 +81,15 @@ void Update()`
`74`	`81`	`}`
`75`	`82`	`}`
`76`	`83`	`}`
`77`		`-#endif`
`78`		`-`
`79`		`- void OnApplicationQuit()`
	`84`	`+`
	`85`	`+ private void OnEditorStateChanged(PlayModeStateChange state)`
`80`	`86`	`{`
`81`		`- Bindings.Close();`
	`87`	`+ if (state == PlayModeStateChange.EnteredEditMode)`
	`88`	`+ {`
	`89`	`+ EditorApplication.playModeStateChanged -= onPlayModeStateChange;`
	`90`	`+ Bindings.Close();`
	`91`	`+ }`
`82`	`92`	`}`
	`93`	`+#endif`
`83`	`94`	`}`
`84`	`95`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 74d7d4a

File tree

1 file changed

1 file changed

`‎Unity/Assets/NativeScript/BootScript.cs`

0 commit comments