From 1a583b016a7b5e22f370e2f425722e3dc240a7dd Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 31 May 2023 02:15:43 -0700
Subject: Initialize the WASAPI device helper earlier

---
 alc/backends/wasapi.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'alc/backends/wasapi.cpp')

diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index a11f8ae9..ccdc54e7 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -891,8 +891,6 @@ int WasapiProxy::messageHandler(std::promise<HRESULT> *promise)
     promise->set_value(S_OK);
     promise = nullptr;
 
-    sDeviceHelper.reset(new DeviceHelper{});
-
     TRACE("Starting message loop\n");
     while(Msg msg{popMessage()})
     {
@@ -2217,6 +2215,9 @@ bool WasapiBackendFactory::init()
                 WARN("Failed to create IMMDeviceEnumerator instance: 0x%08lx\n", hr);
             enumerator = nullptr;
 #endif
+            if(SUCCEEDED(hr))
+                WasapiProxy::sDeviceHelper.reset(new DeviceHelper{});
+
             CoUninitialize();
 
             return hr;
-- 
cgit v1.2.3