fix crash when no HMD detected

sd805 · May 23, 2022 · 269b92d · 269b92d
1 parent d322d5f
commit 269b92d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/L4D2VR/hooks.cpp b/L4D2VR/hooks.cpp
@@ -210,9 +210,12 @@ HRESULT __stdcall Hooks::dPresent(IDirect3DDevice9 *pDevice, const RECT *pSource
 		iD9on12->ReturnUnderlyingResource(mVR->d9RightEyeTexture, 0, nullptr, nullptr);
 	}
 
-	mVR->UpdatePosesAndActions();
-	mVR->UpdateTracking(mVR->setupOrigin);
-
+	if (mVR->isInitialized)
+	{
+		mVR->UpdatePosesAndActions();
+		mVR->UpdateTracking(mVR->setupOrigin);
+	}
+
 	return hkPresent.fOriginal(pDevice, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion);
 }
 

diff --git a/L4D2VR/vr.cpp b/L4D2VR/vr.cpp
@@ -72,6 +72,8 @@ VR::VR(Game *game) {
 
     std::thread configParser(&VR::WaitForConfigUpdate, this);
     configParser.detach();
+
+    isInitialized = true;
 }
 
 

diff --git a/L4D2VR/vr.h b/L4D2VR/vr.h
@@ -101,6 +101,7 @@ class VR
 	IDirect3DTexture9 *d9RightEyeTexture;
 
 	bool isVREnabled;
+	bool isInitialized;
 
 	bool mPressedLeftStick = false;
 	bool mChangedItem = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,8 @@ VR::VR(Game *game) { @@
         std::thread configParser(&VR::WaitForConfigUpdate, this);
         configParser.detach();
+        isInitialized = true;
     }
@@ Expand Down @@