Changeset 57998 in vbox for trunk

Timestamp:

Oct 2, 2015 9:32:40 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7837: Runtime UI: Adding filetype suffix to screenshot filename on x11 only if user has not added it explicitly.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1721 +1721 @@
         /* On X11 Qt Filedialog returns the filepath without the filetype suffix, so adding it ourselves: */
 #ifdef Q_WS_X11
-        tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(QString("%1.%2").arg(strFilename, strFormat))),
-                      strFormat.toAscii().constData());
+        /* Add filetype suffix only if user has not added it explicitly: */
+        if (!strFilename.endsWith(QString(".%1").arg(strFormat)))
+            tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(QString("%1.%2").arg(strFilename, strFormat))),
+                          strFormat.toAscii().constData());
+        else
+            tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(strFilename)),
+                          strFormat.toAscii().constData());
 #else /* !Q_WS_X11 */
         tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(strFilename)),