Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31 from FluffyJenkins/bug/BrokenAudioNoVR

Browse source 
Audio Failure Due to missing VR fix
This commit is contained in:
Thijs Wenker 2019-12-21 22:24:28 +01:00 committed by GitHub
commit b249f94528
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -108,9 +108,11 @@ QString getVrSettingString(const char* section, const char* setting) {
return result; return result;
} }
bool isHMDInErrorState = false;
vr::IVRSystem* acquireOpenVrSystem() { vr::IVRSystem* acquireOpenVrSystem() {
bool hmdPresent = vr::VR_IsHmdPresent(); bool hmdPresent = vr::VR_IsHmdPresent();
if (hmdPresent) { if (hmdPresent && !isHMDInErrorState) {
Lock lock(mutex); Lock lock(mutex);
if (!activeHmd) { if (!activeHmd) {
#if DEV_BUILD #if DEV_BUILD
@ -122,6 +124,14 @@ vr::IVRSystem* acquireOpenVrSystem() {
#if DEV_BUILD #if DEV_BUILD
qCDebug(displayplugins) << "OpenVR display: HMD is " << activeHmd << " error is " << eError; qCDebug(displayplugins) << "OpenVR display: HMD is " << activeHmd << " error is " << eError;
#endif #endif
if (eError == vr::VRInitError_Init_HmdNotFound) {
isHMDInErrorState = true;
activeHmd = nullptr;
#if DEV_BUILD
qCDebug(displayplugins) << "OpenVR: No HMD connected, setting nullptr!";
#endif
}
} }
if (activeHmd) { if (activeHmd) {
#if DEV_BUILD #if DEV_BUILD