v3.1.1 NPE fix in GVRConfigurationManager

Samsung · Mar 1, 2017 · d372c35 · d372c35
1 parent 1108119
commit d372c35
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRConfigurationManager.java b/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRConfigurationManager.java
@@ -110,10 +110,17 @@ protected void configureForHeadset(final String model) {
         GVRPerspectiveCamera.setDefaultFovY(fovY);
 
         if (null != viewManager) {
-            final GVRCameraRig cameraRig = viewManager.getMainScene().getMainCameraRig();
-            updatePerspectiveCameraFovY(cameraRig.getLeftCamera(), fovY);
-            updatePerspectiveCameraFovY(cameraRig.getRightCamera(), fovY);
-            updatePerspectiveCameraFovY(cameraRig.getCenterCamera(), fovY);
+            viewManager.runOnGlThread(new Runnable() {
+                @Override
+                public void run() {
+                    //when the viewmgr starts executing drawframelisteners it has a main scene
+                    //and a camera rig
+                    final GVRCameraRig cameraRig = viewManager.getMainScene().getMainCameraRig();
+                    updatePerspectiveCameraFovY(cameraRig.getLeftCamera(), fovY);
+                    updatePerspectiveCameraFovY(cameraRig.getRightCamera(), fovY);
+                    updatePerspectiveCameraFovY(cameraRig.getCenterCamera(), fovY);
+                }
+            });
         }
     }