Commit 6e4f7493 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: fix opening DVD directory with special characters

parent d63b17d1
......@@ -500,20 +500,18 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
if( dir.isEmpty() )
return;
QString mrl;
const char *scheme = "directory";
if( dir.endsWith( "/VIDEO_TS", Qt::CaseInsensitive ) )
mrl = qfu("dvd://") + toNativeSeparators( dir );
else
{
char *uri = make_URI( qtu( dir ), "directory" );
scheme = "dvd";
char *uri = make_URI( qtu( dir ), scheme );
if( unlikely(uri == NULL) )
return;
mrl = qfu(uri);
free( uri );
}
input_item_t *p_input = input_item_New( THEPL, qtu( mrl ), NULL );
RecentsMRL::getInstance( p_intf )->addRecent( qfu(uri) );
input_item_t *p_input = input_item_New( THEPL, uri, NULL );
free( uri );
if( unlikely( p_input == NULL ) )
return;
......@@ -521,7 +519,6 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
playlist_AddInput( THEPL, p_input,
go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
PLAYLIST_END, pl, pl_Unlocked );
RecentsMRL::getInstance( p_intf )->addRecent( mrl );
if( !go )
input_Read( THEPL, p_input );
vlc_gc_decref( p_input );
......
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