vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon May 25 18:59:52 2015 +0300| [b17adb21c36fbfa52894727c5aff1efd05496f6f] | committer: Rémi Denis-Courmont
qt4: only use COM apartment thread for Shell Interfaces (ref: MSDN KB 287087) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b17adb21c36fbfa52894727c5aff1efd05496f6f --- modules/gui/qt4/components/simple_preferences.cpp | 4 +--- modules/gui/qt4/main_interface_win32.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 2c0cd25..8195b18 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -1255,9 +1255,7 @@ void SPrefsPanel::assoDialog() { 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) ) { void *p; diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp index 68fe421..da264f3 100644 --- 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; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
