Qt: bugfix: playlist's add directory function was failing on input_Read (assert failed)

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

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index fe37d853450fa09f649564e7cf70051d9ee2b03f..92df106f84e3754c7b809acc6f9325c2001e120a 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -93,6 +93,8 @@ DialogsProvider::~DialogsProvider()
 
 void DialogsProvider::quit()
 {
+    /* Stop the playlist */
+    playlist_Stop( THEPL );
     b_isDying = true;
     vlc_object_kill( p_intf->p_libvlc );
     QApplication::closeAllWindows();
@@ -334,9 +336,12 @@ void DialogsProvider::PLAppendDialog()
                             ->showTab( OPEN_FILE_TAB );
 }
 
-/* Unimplemmented yet - Usefull ? */
 void DialogsProvider::MLAppendDialog()
-{}
+{
+    OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false,
+                            OPEN_AND_ENQUEUE, false, false )
+                                    ->showTab( OPEN_FILE_TAB );
+}
 
 /**
  * Simple open
@@ -425,7 +430,7 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
                        go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
                        PLAYLIST_END, pl, pl_Unlocked );
         if( !go )
-            input_Read( THEPL, p_input, false );
+            input_Read( THEPL, p_input, true );
         vlc_gc_decref( p_input );
     }
 }