[vlc-commits] Qt4: allow either COM model for associations (fixes #14323)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Apr  8 18:58:18 2015 +0300| [aa9976b1f41fe7eb44b640163c5ff5f00a4e2953] | committer: Rémi Denis-Courmont

Qt4: allow either COM model for associations (fixes #14323)

The model does not matter here as affected objects do not outlive the
function call and are not used across threads. Still the references
counter of the apartment must remain balanced.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa9976b1f41fe7eb44b640163c5ff5f00a4e2953
---

 modules/gui/qt4/components/simple_preferences.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 2a93bb0..36a49ff 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1256,6 +1256,8 @@ void SPrefsPanel::assoDialog()
     HRESULT hr;
 
     hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
+    if( hr == RPC_E_CHANGED_MODE )
+        hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
     if( SUCCEEDED(hr) )
     {
         void *p;