Plugins: push cancellation down

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 0811f14ecd0ca93b2b32857b338489660436bf90..eb0c937cfad22ac9ed32e61cfab275061175b7e7 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -311,6 +311,7 @@ static void *Init( vlc_object_t *obj )
     char dummy[] = "";
     char *argv[] = { dummy };
     int argc = 1;
+    int canc = vlc_savecancel ();
 
     Q_INIT_RESOURCE( vlc );
 
@@ -464,6 +465,8 @@ static void *Init( vlc_object_t *obj )
     /* Save the path */
     config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
     free( psz_path );
+    vlc_restorecancel (canc);
+    return NULL;
 }
 
 /*****************************************************************************