Skip to content

V
vlc
Commit e64a051e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

qt4: only use COM apartment thread for Shell Interfaces 

(ref: MSDN KB 287087)
parent 33975668
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
modules/gui/qt4/components/simple_preferences.cpp
View file @ e64a051e
...@@ -1255,8 +1255,6 @@ void SPrefsPanel::assoDialog() ...@@ -1255,8 +1255,6 @@ void SPrefsPanel::assoDialog()
{ {
HRESULT hr; HRESULT hr;
hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
if( hr == RPC_E_CHANGED_MODE )
hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
if( SUCCEEDED(hr) ) if( SUCCEEDED(hr) )
{ {
......
modules/gui/qt4/main_interface_win32.cpp
View file @ e64a051e
...@@ -119,9 +119,7 @@ void MainInterface::createTaskBarButtons() ...@@ -119,9 +119,7 @@ void MainInterface::createTaskBarButtons()
p_taskbl = NULL; p_taskbl = NULL;
himl = NULL; himl = NULL;
HRESULT hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); HRESULT hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
if( hr == RPC_E_CHANGED_MODE )
hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
if( FAILED(hr) ) if( FAILED(hr) )
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment