Skip to content

V
vlc-2-2
Commit 82d7c41a authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

Qt: convert: don't enforce container extension (fix #9282)

parent 688f5db3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
modules/gui/qt4/dialogs/convert.cpp
View file @ 82d7c41a
...@@ -129,7 +129,8 @@ void ConvertDialog::fileBrowse() ...@@ -129,7 +129,8 @@ void ConvertDialog::fileBrowse()
QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ), QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ),
p_intf->p_sys->filepath, p_intf->p_sys->filepath,
QString( qtr( "Containers (*" ) + fileExtension + ")" ) ); QString( "%1 (*%2);;%3 (*.*)" ).arg( qtr( "Containers" ) )
.arg( fileExtension ).arg( qtr("All") ) );
fileLine->setText( toNativeSeparators( fileName ) ); fileLine->setText( toNativeSeparators( fileName ) );
setDestinationFileExtension(); setDestinationFileExtension();
} }
...@@ -174,13 +175,10 @@ void ConvertDialog::setDestinationFileExtension() ...@@ -174,13 +175,10 @@ void ConvertDialog::setDestinationFileExtension()
if( !fileLine->text().isEmpty() && profile->isEnabled() ) if( !fileLine->text().isEmpty() && profile->isEnabled() )
{ {
QString newFileExtension = "." + profile->getMux(); QString newFileExtension = "." + profile->getMux();
QString newFileName; if( fileLine->text().lastIndexOf( "." ) == -1 )
int index = fileLine->text().lastIndexOf( "." ); {
if( index != -1 ) { QString newFileName = fileLine->text().append( newFileExtension );
newFileName = fileLine->text().left( index ).append( newFileExtension ); fileLine->setText( toNativeSeparators( newFileName ) );
} else {
newFileName = fileLine->text().append( newFileExtension );
} }
fileLine->setText( toNativeSeparators( newFileName ) );
} }
} }
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