diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-15 10:13:53 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-15 10:13:53 +0200 |
| commit | 7cde5013b510d997c8048512f44d87e854480bd0 (patch) | |
| tree | 3b1b628b5c2c57410029d24d29280044e846a237 /dinput | |
| parent | a95313c4ecde314abeb00ee9b5cb287e64658e83 (diff) | |
dinput, COM: temporary fixes, to be tested
Diffstat (limited to 'dinput')
| -rw-r--r-- | dinput/dinput.cpp | 3 | ||||
| -rw-r--r-- | dinput/dinput.hpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/dinput/dinput.cpp b/dinput/dinput.cpp index 9556815a..1b0cf09d 100644 --- a/dinput/dinput.cpp +++ b/dinput/dinput.cpp @@ -6,11 +6,10 @@ std::atomic<int> dinput_handle::refcnt; std::atomic_flag dinput_handle::init_lock = ATOMIC_FLAG_INIT; -dinput_handle::di_t dinput_handle::handle(dinput_handle::make_di()); LPDIRECTINPUT8& dinput_handle::init_di() { - init_com_threading(com_apartment); + init_com_threading(com_multithreaded); static LPDIRECTINPUT8 di_ = nullptr; if (di_ == nullptr) diff --git a/dinput/dinput.hpp b/dinput/dinput.hpp index 53f1c4af..59873527 100644 --- a/dinput/dinput.hpp +++ b/dinput/dinput.hpp @@ -27,7 +27,6 @@ public: private: static std::atomic<int> refcnt; static std::atomic_flag init_lock; - static di_t handle; static LPDIRECTINPUT8& init_di(); public: |