Actually launch the session if no event is received

Add more message boxes too in case hooks fail for some odd reason.

Author: Detegr

CMakeLists.txt

@@ -37,7 +37,7 @@ set(HEADERS
 set(openRBRVR_Major 0)
 set(openRBRVR_Minor 5)
 set(openRBRVR_Patch 0)
-set(openRBRVR_Tweak 2)
+set(openRBRVR_Tweak 3)
 set(openRBRVR_TweakStr "-rc${openRBRVR_Tweak}")
 
 configure_file(

OpenXR.cpp

@@ -299,6 +299,8 @@ void OpenXR::Init(IDirect3DDevice9* dev, const Config& cfg, IDirect3DVR9** vrdev
         .type = XR_TYPE_EVENT_DATA_BUFFER,
         .next = nullptr,
     };
+
+    bool sessionRunning = false;
     auto retries = 10;
     while (retries-- > 0) {
         if (auto res = xrPollEvent(instance, &eventData); res == XR_SUCCESS) {
@@ -316,13 +318,14 @@ void OpenXR::Init(IDirect3DDevice9* dev, const Config& cfg, IDirect3DVR9** vrdev
                         throw std::runtime_error(std::format("Failed to initialize OpenXR. xrBeginSession: {}", XrResultToString(instance, res)));
                     }
 
+                    sessionRunning = true;
                     break;
                 }
             }
         }
     }
 
-    if (retries == 0) {
+    if (!sessionRunning) {
         Dbg("Did not receive XR_SESSION_STATE_READY event, launching the session anyway...");
         XrSessionBeginInfo sessionBeginInfo = {
             .type = XR_TYPE_SESSION_BEGIN_INFO,

openRBRVR.cpp

@@ -644,7 +644,7 @@ HRESULT __stdcall DXHook_CreateDevice(
             gVR = std::make_unique<OpenVR>(dev, gCfg, &gD3DVR, winBounds.right, winBounds.bottom);
         }
     } catch (const std::runtime_error& e) {
-        MessageBoxA(hFocusWindow, std::format("VR init failed: {}", e.what()).c_str(), "VR init failed", MB_OK);
+        MessageBoxA(hFocusWindow, e.what(), "VR init failed", MB_OK);
     }
     // Initialize this pointer here, as it's too early to do this in openRBRVR constructor
     auto rxHandle = GetModuleHandle("Plugins\\rbr_rx.dll");
@@ -669,7 +669,11 @@ IDirect3D9* __stdcall DXHook_Direct3DCreate9(UINT SDKVersion)
     if (gCfg.runtime == OPENXR) {
         // OpenXR must be initialized before calling Direct3DCreate9
         // because it will query extensions when initializing DXVK
-        gVR = std::make_unique<OpenXR>();
+        try {
+            gVR = std::make_unique<OpenXR>();
+        } catch (const std::runtime_error& e) {
+            MessageBoxA(nullptr, e.what(), "OpenXR init failed", MB_OK);
+        }
     }
 
     auto d3d = hooks::create.call(SDKVersion);
@@ -682,6 +686,7 @@ IDirect3D9* __stdcall DXHook_Direct3DCreate9(UINT SDKVersion)
         hooks::createdevice = Hook(d3dvtbl->CreateDevice, DXHook_CreateDevice);
     } catch (const std::runtime_error& e) {
         Dbg(e.what());
+        MessageBoxA(nullptr, e.what(), "Hooking failed", MB_OK);
     }
     return d3d;
 }
@@ -709,6 +714,7 @@ openRBRVR::openRBRVR(IRBRGame* g)
         hooks::renderparticles = Hook(*reinterpret_cast<decltype(RBRHook_RenderParticles)*>(RBRRenderParticlesFunctionAddr), RBRHook_RenderParticles);
     } catch (const std::runtime_error& e) {
         Dbg(e.what());
+        MessageBoxA(nullptr, e.what(), "Hooking failed", MB_OK);
     }
     gCfg = gSavedCfg = Config::fromFile("Plugins\\openRBRVR.ini");
 }