From 0ff283d09e68afad49cdc10088c823e8fe528545 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 12 Aug 2015 12:24:53 -0700
Subject: [PATCH] Fixing crash in vive controllers

---
 .../src/input-plugins/ViveControllerManager.cpp          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
index dbcaa05143..52b33b9715 100644
--- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
+++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
@@ -65,7 +65,14 @@ ViveControllerManager::ViveControllerManager() :
 
 bool ViveControllerManager::isSupported() const {
 #ifdef Q_OS_WIN
-    return vr::VR_IsHmdPresent();
+    bool success = vr::VR_IsHmdPresent();
+    if (success) {
+        vr::HmdError eError = vr::HmdError_None;
+        auto hmd = vr::VR_Init(&eError);
+        success = (hmd != nullptr);
+        vr::VR_Shutdown();
+    }
+    return success;
 #else 
     return false;
 #endif