Qt: fix VLM geometry restoration

[vlc] / modules / gui / qt4 / main_interface_win32.cpp

diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp
index be786ccb6f9e6eeec8f52a4d36eb253f4d15e793..bbbfe44c0d69f85a01dcb890fd553928555edf33 100644 (file)
--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -81,7 +81,7 @@ void MainInterface::createTaskBarButtons()
 
     if( S_OK == CoCreateInstance( &clsid_ITaskbarList,
                 NULL, CLSCTX_INPROC_SERVER,
-                &IID_ITaskbarList3,
+                IID_ITaskbarList3,
                 (void **)&p_taskbl) )
     {
         p_taskbl->vt->HrInit(p_taskbl);
@@ -239,6 +239,9 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
 
 void MainInterface::changeThumbbarButtons( int i_status )
 {
+    if( p_taskbl == NULL )
+        return;
+
     // Define an array of three buttons. These buttons provide images through an
     // image list and also provide tooltips.
     DWORD dwMask = THB_BITMAP | THB_FLAGS;