From 7cde5013b510d997c8048512f44d87e854480bd0 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 15 Aug 2016 10:13:53 +0200
Subject: dinput, COM: temporary fixes, to be tested

---
 dinput/dinput.cpp | 3 +--
 dinput/dinput.hpp | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'dinput')

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:
-- 
cgit v1.2.3