summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVal Doroshchuk <valentyn.doroshchuk@qt.io>2018-05-11 09:24:01 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2018-05-14 13:32:11 +0000
commitd2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5 (patch)
tree9b74f81fe90fae3b74c64ecddc5df57b328d6004
parent14a77698a01782f27e395bbc8694b808455d4ba1 (diff)
downloadqtmultimedia-d2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5.tar.gz
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>
-rw-r--r--src/plugins/wasapi/qwasapiutils.cpp4
1 files changed, 1 insertions, 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()