Commit aa9976b1 authored by Rémi Denis-Courmont's avatar 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.
parent 49df5889
...@@ -1256,6 +1256,8 @@ void SPrefsPanel::assoDialog() ...@@ -1256,6 +1256,8 @@ void SPrefsPanel::assoDialog()
HRESULT hr; HRESULT hr;
hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
if( hr == RPC_E_CHANGED_MODE )
hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
if( SUCCEEDED(hr) ) if( SUCCEEDED(hr) )
{ {
void *p; void *p;
......
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