Commit 0dce302d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: try to fix the crash on start

The changes on preferences association registration, seems to have
attacked the taskbar part
parent 2ac31462
......@@ -117,10 +117,11 @@ void MainInterface::createTaskBarButtons()
FIXME:the play button's picture doesn't changed to pause when clicked
*/
if( FAILED(CoInitializeEx( NULL, COINIT_MULTITHREADED )) )
vlc_assert_unreachable();
HRESULT hr = CoInitializeEx( NULL, COINIT_MULTITHREADED );
if( hr == RPC_E_CHANGED_MODE )
hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED );
if( S_OK == CoCreateInstance( CLSID_TaskbarList,
if( SUCCEEDED(hr) && S_OK == CoCreateInstance( CLSID_TaskbarList,
NULL, CLSCTX_INPROC_SERVER,
IID_ITaskbarList3,
(void **)&p_taskbl) )
......@@ -189,7 +190,6 @@ void MainInterface::createTaskBarButtons()
himl = NULL;
p_taskbl = NULL;
}
}
bool MainInterface::winEvent ( MSG * msg, long * result )
......
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