From d2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5 Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Fri, 11 May 2018 09:24:01 +0200
Subject: Wasapi: Always use multithreaded concurrency model in initialization

Using apartmentthreaded model for static objects can cause not calling
destructors for global objects in shared libraries.

Task-number: QTBUG-67353
Change-Id: I1554203b1d7a48ff9f0c4d2f0d6246e445a07f46
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/plugins/wasapi/qwasapiutils.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/wasapi/qwasapiutils.cpp b/src/plugins/wasapi/qwasapiutils.cpp
index 0d03982de..497e5fa6e 100644
--- a/src/plugins/wasapi/qwasapiutils.cpp
+++ b/src/plugins/wasapi/qwasapiutils.cpp
@@ -94,9 +94,7 @@ struct CoInitializer
 {
     CoInitializer()
     {
-        const bool isGuiThread = QCoreApplication::instance() &&
-                QThread::currentThread() == QCoreApplication::instance()->thread();
-        CoInitializeEx(NULL, isGuiThread ? COINIT_APARTMENTTHREADED : COINIT_MULTITHREADED);
+        CoInitializeEx(NULL, COINIT_MULTITHREADED);
     }
 
     ~CoInitializer()
-- 
cgit v1.2.1