Changeset 14198

Timestamp:

Sep 8, 2013, 7:12:33 PM (8 years ago)

Author:

jordan

Message:

(trunk, qt) #3606 'Qt client New Torrent from Source Folder is Goofy' -- fixed, mikedld

File:

• trunk/qt/make-dialog.cc (modified) (4 diffs)

trunk/qt/make-dialog.cc

@@ -44 +44 @@
 ****
 ***/
+
+namespace
+{
+  QString removeTrailingSlash (const QString& path)
+  {
+    // QFileDialog may return path ending with slash if that path refers to
+    // directory. QFileInfo::fileName() applied to such path would then return
+    // an empty string which is not what we want, so we strip the slash here.
+
+    if (!path.endsWith (QDir::separator ()))
+      return path;
+
+    return path.left (path.length () - 1);
+  }
+}
 
 void
@@ -187 +202 @@
 MakeDialog :: onFileSelected( const QString& filename )
 {
-    myFile = filename;
+    myFile = removeTrailingSlash (filename);
     myFileButton->setText( QFileInfo(myFile).fileName() );
     onSourceChanged( );
@@ -212 +227 @@
 MakeDialog :: onFolderSelected( const QString& filename )
 {
-    myFolder = filename;
+    myFolder = removeTrailingSlash (filename);
     myFolderButton->setText( QFileInfo(myFolder).fileName() );
     onSourceChanged( );
@@ -237 +252 @@
 MakeDialog :: onDestinationSelected( const QString& filename )
 {
-    myDestination = filename;
+    myDestination = removeTrailingSlash (filename);
     myDestinationButton->setText( QFileInfo(myDestination).fileName() );
 }