Fix NRE thrown by changing predicate order (#654)

XRTK · Jul 25, 2020 · ed50da5 · ed50da5
1 parent 5a44237
commit ed50da5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Runtime/Providers/CameraSystem/BaseCameraDataProvider.cs b/Runtime/Providers/CameraSystem/BaseCameraDataProvider.cs
@@ -194,8 +194,8 @@ public override void Disable()
         {
             base.Disable();
 
-            if (CameraRig.GameObject.IsNull() ||
-                CameraRig == null)
+            if (CameraRig == null ||
+                CameraRig.GameObject.IsNull())
             {
                 return;
             }