fixed init crash if you follow very specific startup steps

Sam Gondelman committed 11 years ago

Commit 1af51571 parent 0e4d0654 files · +20 −21Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

     container->setFocus();
     container->installEventFilter(DependencyManager::get<OffscreenUi>().data());
-    // Necessary to call this here so Oculus can get inited before Sixense
-    getDisplayPlugins();
-    // must be before initializeGL()
-    _activeInputPlugins.clear();
-    auto inputPlugins = getInputPlugins();
-    foreach(auto inputPlugin, inputPlugins) {
-        QString name = inputPlugin->getName();
-        if (name == KeyboardMouseDevice::NAME) {
-            _keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
-            break;
-        }
-    }
-    updateInputModes();
     _offscreenContext->makeCurrent();
     initializeGL();
     // initialization continues in initializeGL when OpenGL context is ready
             resizeGL();
         }
     });
+    // This will prevent the hid_init sixense crash
+    getActiveDisplayPlugin();
+    // This will set up the input plugins UI
+    _activeInputPlugins.clear();
+    auto inputPlugins = getInputPlugins();
+    foreach(auto inputPlugin, inputPlugins) {
+        QString name = inputPlugin->getName();
+        if (name == KeyboardMouseDevice::NAME) {
+            _keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
+        }
+    }
+    updateInputModes();
 }
 template<typename F>

Keyboard shortcuts