Changeset 77163 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 5, 2019 1:15:00 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128638

Message:

FE/Qt: bugref:9080. Make sure viso file name is in sync with viso image name.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2648 +2648 @@
         QStringList files = pVisoCreator->entryList();
         QString strVisoName = pVisoCreator->visoName();
+        if (strVisoName.isEmpty())
+            strVisoName = "ad-hoc";
 
         if (files.empty() || files[0].isEmpty())
@@ -2656 +2658 @@
         /* Produce the VISO. */
         char szVisoPath[RTPATH_MAX];
-        int vrc = RTPathJoin(szVisoPath, sizeof(szVisoPath), strFolder.toUtf8().constData(), "ad-hoc.viso");
+        QString strFileName = QString("%1%2").arg(strVisoName).arg(".viso");
+        int vrc = RTPathJoin(szVisoPath, sizeof(szVisoPath), strFolder.toUtf8().constData(), strFileName.toUtf8().constData());
         if (RT_SUCCESS(vrc))
         {
@@ -2668 +2671 @@
                 {
                     RTStrmPrintf(pStrmViso, "--iprt-iso-maker-file-marker-bourne-sh %RTuuid\n", &Uuid);
-                    if (!strVisoName.isEmpty())
-                        RTStrmPrintf(pStrmViso, "--volume-id=%s\n", strVisoName.toUtf8().constData());
+                    RTStrmPrintf(pStrmViso, "--volume-id=%s\n", strVisoName.toUtf8().constData());
 
                     for (int iFile = 0; iFile < files.size(); iFile++)