qt4: only use COM apartment thread for Shell Interfaces

(ref: MSDN KB 287087)

qt4: only use COM apartment thread for Shell Interfaces
(ref: MSDN KB 287087)
e64a051e · Rémi Denis-Courmont · 33975668 · e64a051e · e64a051e
Commit e64a051e authored May 25, 2015 by Rémi Denis-Courmont
Showing with 2 additions and 6 deletions

modules/gui/qt4/components/simple_preferences.cpp modules/gui/qt4/components/simple_preferences.cpp +1 -3

modules/gui/qt4/main_interface_win32.cpp modules/gui/qt4/main_interface_win32.cpp +1 -3

No files found.
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1255,8 +1255,6 @@ void SPrefsPanel::assoDialog()
 {
    HRESULT hr;

-    hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
-    if( hr == RPC_E_CHANGED_MODE )
    hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
    if( SUCCEEDED(hr) )
    {

--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -119,9 +119,7 @@ void MainInterface::createTaskBarButtons()
    p_taskbl = NULL;
    himl = NULL;

-    HRESULT hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
-    if( hr == RPC_E_CHANGED_MODE )
-        hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
+    HRESULT hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
    if( FAILED(hr) )
        return;