Commit 1c00d84a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Jean-Baptiste Kempf

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.

(cherry picked from commit aa9976b1f41fe7eb44b640163c5ff5f00a4e2953)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 76be75bc
......@@ -1269,6 +1269,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;
......
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