Commit 1806d87e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 - when cancel was pressed in the open directory dialog, an empty directory

string was being added to the playlist, which resulted in an error. Patch  by Nick Vercammen.
parent 3dd763ad
......@@ -343,12 +343,16 @@ static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
{
QString dir = QFileDialog::getExistingDirectory ( 0,
_("Open directory") );
input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
if (!dir.isEmpty()) {
input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
0, NULL, -1 );
playlist_AddInput( THEPL, p_input,
playlist_AddInput( THEPL, p_input,
go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
PLAYLIST_END, pl, VLC_FALSE );
input_Read( THEPL, p_input, VLC_FALSE );
input_Read( THEPL, p_input, VLC_FALSE );
}
}
void DialogsProvider::PLAppendDir()
......
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