Don't use PLAYLIST_GO when adding directories, fix trax 16th issue

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 1aa8d75a81894772e1e21cd4e98f3aa47de921d0..f244eb74c53c4e70ecf90d27989351ce00c0f5bc 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -313,11 +313,6 @@ static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
     }
 }
 
-void DialogsProvider::openDirDialog()
-{
-    openDirectory( p_intf, true, true );
-}
-
 void DialogsProvider::PLAppendDir()
 {
     openDirectory( p_intf, true, false );

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index fd6269bf5589b54c5579991aea8ad7347eadd722..c84a40cd9c4a864bd32e5e5959b098a85ffab507 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -152,7 +152,6 @@ public slots:
     void openFileDialog();
     void openNetDialog();
     void openCaptureDialog();
-    void openDirDialog();
 
     void PLAppendDialog();
     void MLAppendDialog();

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 66eed7ee190423f248cf86729cba89b9cae29375..027e6ba0c91fbeb48588aa03c642fc4420902b5b 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -192,7 +192,7 @@ QMenu *QVLCMenu::FileMenu()
     DP_SADD( menu, qtr( "Open &File..." ), "",
             ":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" );
     DP_SADD( menu, qtr( I_OPEN_FOLDER ), "",
-            ":/pixmaps/vlc_folder-grey_16px.png", openDirDialog(), "Ctrl+F" );
+            ":/pixmaps/vlc_folder-grey_16px.png", PLAppendDir(), "Ctrl+F" );
     DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/vlc_disc_16px.png",
              openDiscDialog(), "Ctrl+D" );
     DP_SADD( menu, qtr( "Open &Network..." ), "",