From 62c137157ed04d08e6bcc7a741bcdb046943776f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 17 Aug 2016 21:40:22 +0200 Subject: compat/win32-com: default to right COM type without caller specifying it The main window always needs the apartment threaded context for OLE used by Qt. Default to apartment threaded before a QApplication is created, or if the thread is the QApplication thread. Use multithreaded COM otherwise. --- dinput/dinput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dinput') diff --git a/dinput/dinput.cpp b/dinput/dinput.cpp index 1b0cf09d..93aca79a 100644 --- a/dinput/dinput.cpp +++ b/dinput/dinput.cpp @@ -9,7 +9,7 @@ std::atomic_flag dinput_handle::init_lock = ATOMIC_FLAG_INIT; LPDIRECTINPUT8& dinput_handle::init_di() { - init_com_threading(com_multithreaded); + init_com_threading(); static LPDIRECTINPUT8 di_ = nullptr; if (di_ == nullptr) -- cgit v1.2.3