Merge pull request #5557 from jherico/marge

Fixing crash in vive controllers
This commit is contained in:
Brad Hefta-Gaub 2015-08-12 12:45:57 -07:00
commit acf9933925

View file

@ -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