WebXRCamera now removes event listeners OnDisable

ElHacker · web-flow · commit 3c0730898652 · 2021-02-05T15:56:53.000-08:00
There's an issue when an app destroys WebXRCamera instances (for example on scene changes) that causes NullPointer exceptions whenever the WebXRManager(WebXRSubsystem) triggers OnHeadsetUpdate and OnXRChange events
diff --git a/Packages/webxr/Runtime/Scripts/WebXRCamera.cs b/Packages/webxr/Runtime/Scripts/WebXRCamera.cs
@@ -28,6 +28,12 @@ void OnEnable()
       WebXRManager.OnXRChange += OnXRChange;
       WebXRManager.OnHeadsetUpdate += OnHeadsetUpdate;
     }
+    
+    void OnDisable()
+    {
+      WebXRManager.OnXRChange -= OnXRChange;
+      WebXRManager.OnHeadsetUpdate -= OnHeadsetUpdate;
+    }
 
     void Update()
     {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,12 @@ void OnEnable()`
`28`	`28`	`WebXRManager.OnXRChange += OnXRChange;`
`29`	`29`	`WebXRManager.OnHeadsetUpdate += OnHeadsetUpdate;`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ void OnDisable()`
	`33`	`+ {`
	`34`	`+ WebXRManager.OnXRChange -= OnXRChange;`
	`35`	`+ WebXRManager.OnHeadsetUpdate -= OnHeadsetUpdate;`
	`36`	`+ }`
`31`	`37`
`32`	`38`	`void Update()`
`33`	`39`	`{`