summaryrefslogtreecommitdiffhomepage
path: root/dinput
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-08-17 21:40:22 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-08-17 22:32:03 +0200
commit62c137157ed04d08e6bcc7a741bcdb046943776f (patch)
tree8f717bd5fa9fdda743f08677544e8cd5c9f9fef2 /dinput
parentfad4b316af2cde1a5988ed1bbdbc4ba5933e88df (diff)
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.
Diffstat (limited to 'dinput')
-rw-r--r--dinput/dinput.cpp2
1 files changed, 1 insertions, 1 deletions
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)