Bug 1323088 - OpenVR controller manager should not be created while loading runtime fail; r?kip draft
authorDaosheng Mu <daoshengmu@gmail.com>
Tue, 13 Dec 2016 13:56:58 +0800
changeset 448873 cc5b9dee894bf2a380ebae09d97c989c429d23b4
parent 448717 f46f85dcfbc2b3098ea758825d18be6fab33cbc6
child 539401 9742f5903cd7c54fddefb6cf9d2fb9913a1a76da
push id38463
push userbmo:dmu@mozilla.com
push dateTue, 13 Dec 2016 06:14:29 +0000
reviewerskip
bugs1323088
milestone53.0a1
Bug 1323088 - OpenVR controller manager should not be created while loading runtime fail; r?kip MozReview-Commit-ID: 6gM9r1Y4MkG
gfx/vr/VRManager.cpp
--- a/gfx/vr/VRManager.cpp
+++ b/gfx/vr/VRManager.cpp
@@ -76,21 +76,20 @@ VRManager::VRManager()
   }
 #endif
 
 #if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX)
   // OpenVR is cross platform compatible
   mgr = VRDisplayManagerOpenVR::Create();
   if (mgr) {
     mManagers.AppendElement(mgr);
-  }
-
-  controllerMgr = VRControllerManagerOpenVR::Create();
-  if (controllerMgr) {
-    mControllerManagers.AppendElement(controllerMgr);
+    controllerMgr = VRControllerManagerOpenVR::Create();
+    if (controllerMgr) {
+      mControllerManagers.AppendElement(controllerMgr);
+    }
   }
 
   // OSVR is cross platform compatible
   mgr = VRDisplayManagerOSVR::Create();
   if (mgr) {
       mManagers.AppendElement(mgr);
   }
 #endif