Skip to content

V
vlc-2-2
Commit 67bb9bab authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4 sout: convert option to UTF-8 once, not twice (fixes: #3077)

parent ac9386fa
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
modules/gui/qt4/dialogs_provider.cpp
View file @ 67bb9bab
...@@ -569,7 +569,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, ...@@ -569,7 +569,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
bool b_transcode_only, bool b_transcode_only,
QStringList options ) QStringList options )
{ {
char *psz_soutoption; QString soutoption;
/* Stream */ /* Stream */
if( !b_transcode_only ) if( !b_transcode_only )
...@@ -577,7 +577,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, ...@@ -577,7 +577,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
SoutDialog *s = new SoutDialog( parent, p_intf, mrl ); SoutDialog *s = new SoutDialog( parent, p_intf, mrl );
if( s->exec() == QDialog::Accepted ) if( s->exec() == QDialog::Accepted )
{ {
psz_soutoption = strdup( qtu( s->getMrl() ) ); soutoption = s->getMrl();
delete s; delete s;
} }
else else
...@@ -589,7 +589,7 @@ void DialogsProvider::streamingDialog( QWidget *parent, ...@@ -589,7 +589,7 @@ void DialogsProvider::streamingDialog( QWidget *parent,
ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl ); ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl );
if( s->exec() == QDialog::Accepted ) if( s->exec() == QDialog::Accepted )
{ {
psz_soutoption = strdup( qtu( s->getMrl() ) ); soutoption = s->getMrl();
delete s; delete s;
} }
else else
...@@ -599,9 +599,9 @@ void DialogsProvider::streamingDialog( QWidget *parent, ...@@ -599,9 +599,9 @@ void DialogsProvider::streamingDialog( QWidget *parent,
} }
/* Get SoutMRL */ /* Get SoutMRL */
if( !EMPTY_STR( psz_soutoption ) ) if( !soutoption.isEmpty() )
{ {
options += QString( psz_soutoption ).split( " :"); options += soutoption.split( " :");
/* Create Input */ /* Create Input */
input_item_t *p_input; input_item_t *p_input;
...@@ -627,7 +627,6 @@ void DialogsProvider::streamingDialog( QWidget *parent, ...@@ -627,7 +627,6 @@ void DialogsProvider::streamingDialog( QWidget *parent,
RecentsMRL::getInstance( p_intf )->addRecent( mrl ); RecentsMRL::getInstance( p_intf )->addRecent( mrl );
} }
free( psz_soutoption );
} }
void DialogsProvider::openAndStreamingDialogs() void DialogsProvider::openAndStreamingDialogs()
......
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