Commit b399b131 authored by Rafaël Carré's avatar Rafaël Carré

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

parent 1a0b7679
...@@ -313,11 +313,6 @@ static void openDirectory( intf_thread_t* p_intf, bool pl, bool go ) ...@@ -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() void DialogsProvider::PLAppendDir()
{ {
openDirectory( p_intf, true, false ); openDirectory( p_intf, true, false );
......
...@@ -152,7 +152,6 @@ public slots: ...@@ -152,7 +152,6 @@ public slots:
void openFileDialog(); void openFileDialog();
void openNetDialog(); void openNetDialog();
void openCaptureDialog(); void openCaptureDialog();
void openDirDialog();
void PLAppendDialog(); void PLAppendDialog();
void MLAppendDialog(); void MLAppendDialog();
......
...@@ -192,7 +192,7 @@ QMenu *QVLCMenu::FileMenu() ...@@ -192,7 +192,7 @@ QMenu *QVLCMenu::FileMenu()
DP_SADD( menu, qtr( "Open &File..." ), "", DP_SADD( menu, qtr( "Open &File..." ), "",
":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" ); ":/pixmaps/vlc_file-asym_16px.png", openFileDialog(), "Ctrl+O" );
DP_SADD( menu, qtr( I_OPEN_FOLDER ), "", 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", DP_SADD( menu, qtr( "Open &Disc..." ), "", ":/pixmaps/vlc_disc_16px.png",
openDiscDialog(), "Ctrl+D" ); openDiscDialog(), "Ctrl+D" );
DP_SADD( menu, qtr( "Open &Network..." ), "", DP_SADD( menu, qtr( "Open &Network..." ), "",
......
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