Browse Source

Merge pull request #8575 from DonLakeFlyer/MobileFileSave

Mobile File Dialog: Fix file extension appending
QGC4.4
Don Gagne 5 years ago committed by DoinLakeFlyer
parent
commit
a1563aa5e3
  1. 6
      src/QmlControls/QGCFileDialogController.cc

6
src/QmlControls/QGCFileDialogController.cc

@ -44,7 +44,7 @@ QString QGCFileDialogController::filenameWithExtension(const QString& filename,
bool matchFound = false; bool matchFound = false;
for (const QString& extension : rgFileExtensions) { for (const QString& extension : rgFileExtensions) {
QString dotExtension = QString(".%1").arg(extension); QString dotExtension = QStringLiteral(".%1").arg(extension);
matchFound = filenameWithExtension.endsWith(dotExtension); matchFound = filenameWithExtension.endsWith(dotExtension);
if (matchFound) { if (matchFound) {
break; break;
@ -52,10 +52,10 @@ QString QGCFileDialogController::filenameWithExtension(const QString& filename,
} }
if (!matchFound) { if (!matchFound) {
filenameWithExtension += rgFileExtensions[0]; filenameWithExtension += QStringLiteral(".%1").arg(rgFileExtensions[0]);
} }
return filenameWithExtension; return filenameWithExtension;
} }
bool QGCFileDialogController::fileExists(const QString& filename) bool QGCFileDialogController::fileExists(const QString& filename)

Loading…
Cancel
Save