Do not quote when single raster file is selected

elpaso · elpaso · commit cc4cee8f9155 · 2017-08-24T07:39:54.000+02:00
diff --git a/src/gui/qgsfilewidget.cpp b/src/gui/qgsfilewidget.cpp
@@ -283,7 +283,6 @@ void QgsFileWidget::openFileDialog()
   if ( mStorageMode != GetMultipleFiles )
   {
     fileName = relativePath( fileName, true );
-    // Keep the new value
     setFilePath( fileName );
   }
   else
@@ -292,7 +291,14 @@ void QgsFileWidget::openFileDialog()
     {
       fileNames.replace( i, relativePath( fileNames.at( i ), true ) );
     }
-    setFilePath( QStringLiteral( "\"%1\"" ).arg( fileNames.join( "\" \"" ) ) );
+    if ( fileNames.length() > 1 )
+    {
+      setFilePath( QStringLiteral( "\"%1\"" ).arg( fileNames.join( "\" \"" ) ) );
+    }
+    else
+    {
+      setFilePath( fileNames.first( ) );
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,6 @@ void QgsFileWidget::openFileDialog()`
`283`	`283`	`if ( mStorageMode != GetMultipleFiles )`
`284`	`284`	`{`
`285`	`285`	`fileName = relativePath( fileName, true );`
`286`		`- // Keep the new value`
`287`	`286`	`setFilePath( fileName );`
`288`	`287`	`}`
`289`	`288`	`else`
`@@ -292,7 +291,14 @@ void QgsFileWidget::openFileDialog()`
`292`	`291`	`{`
`293`	`292`	`fileNames.replace( i, relativePath( fileNames.at( i ), true ) );`
`294`	`293`	`}`
`295`		`- setFilePath( QStringLiteral( "\"%1\"" ).arg( fileNames.join( "\" \"" ) ) );`
	`294`	`+ if ( fileNames.length() > 1 )`
	`295`	`+ {`
	`296`	`+ setFilePath( QStringLiteral( "\"%1\"" ).arg( fileNames.join( "\" \"" ) ) );`
	`297`	`+ }`
	`298`	`+ else`
	`299`	`+ {`
	`300`	`+ setFilePath( fileNames.first( ) );`
	`301`	`+ }`
`296`	`302`	`}`
`297`	`303`	`}`
`298`	`304`