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

[vlc] / modules / gui / qt4 / dialogs / convert.cpp

diff --git a/modules/gui/qt4/dialogs/convert.cpp b/modules/gui/qt4/dialogs/convert.cpp
index 6a8c8ac1c596c1a1e1fb6a5b21d065a442e28848..62cf8401870fa1b5cea9dfc6ca6d994710e7cf21 100644 (file)
--- a/modules/gui/qt4/dialogs/convert.cpp
+++ b/modules/gui/qt4/dialogs/convert.cpp
@@ -129,7 +129,8 @@ void ConvertDialog::fileBrowse()
 
     QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ),
         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 ) );
     setDestinationFileExtension();
 }
@@ -174,13 +175,10 @@ void ConvertDialog::setDestinationFileExtension()
     if( !fileLine->text().isEmpty() && profile->isEnabled() )
     {
         QString newFileExtension = "." + profile->getMux();
-        QString newFileName;
-        int index = fileLine->text().lastIndexOf( "." );
-        if( index != -1 ) {
-            newFileName = fileLine->text().left( index ).append( newFileExtension );
-        } else {
-            newFileName = fileLine->text().append( newFileExtension );
+        if( fileLine->text().lastIndexOf( "." ) == -1 )
+        {
+            QString newFileName = fileLine->text().append( newFileExtension );
+            fileLine->setText( toNativeSeparators( newFileName ) );
         }
-        fileLine->setText( toNativeSeparators( newFileName ) );
     }
 }