From 80d397555ddb7388d8a60ea054df58b6eb30047c Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 28 Mar 2016 14:45:09 -0700
Subject: [PATCH] Fixing input API, DLL path for Oculus

---
 plugins/oculus/src/OculusControllerManager.cpp | 3 ++-
 plugins/oculus/src/OculusControllerManager.h   | 2 +-
 plugins/oculus/src/OculusHelpers.cpp           | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp
index 0761dc1655..f11ec18b10 100644
--- a/plugins/oculus/src/OculusControllerManager.cpp
+++ b/plugins/oculus/src/OculusControllerManager.cpp
@@ -35,7 +35,7 @@ bool OculusControllerManager::isSupported() const {
     return oculusAvailable();
 }
 
-void OculusControllerManager::activate() {
+bool OculusControllerManager::activate() {
     InputPlugin::activate();
     if (!_session) {
         _session = acquireOculusSession();
@@ -50,6 +50,7 @@ void OculusControllerManager::activate() {
     if (_touch) {
         userInputMapper->registerDevice(_touch);
     }
+    return true;
 }
 
 void OculusControllerManager::deactivate() {
diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h
index fb126ca2a8..fc10dcc73d 100644
--- a/plugins/oculus/src/OculusControllerManager.h
+++ b/plugins/oculus/src/OculusControllerManager.h
@@ -27,7 +27,7 @@ public:
     bool isJointController() const override { return true; }
     const QString& getName() const override { return NAME; }
 
-    void activate() override;
+    bool activate() override;
     void deactivate() override;
 
     void pluginFocusOutEvent() override;
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index cfac175392..fb49d1d001 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -12,6 +12,7 @@
 
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QFile>
+#include <QtCore/QDir>
 
 using Mutex = std::mutex;
 using Lock = std::unique_lock<Mutex>;
@@ -40,7 +41,8 @@ void logFatal(const char* what) {
     qFatal(error.c_str());
 }
 
-static const QString GOOD_OCULUS_RUNTIME_FILE { "C:\\Program Files(x86)\\Oculus\\Support\\oculus - runtime\\LibOVRRT64_1.dll" };
+static const QString OCULUS_RUNTIME_PATH { "C:\\Program Files (x86)\\Oculus\\Support\\oculus-runtime" };
+static const QString GOOD_OCULUS_RUNTIME_FILE { OCULUS_RUNTIME_PATH + "\\LibOVRRT64_1.dll" };
 
 bool oculusAvailable() {
     ovrDetectResult detect = ovr_Detect(0);