Changeset 88246 in vbox

Timestamp:

Mar 22, 2021 3:25:33 PM (4 years ago)

Author:

vboxsync

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

143446

Message:

FE/Qt: bugref:9515. dont start first run wizard in case an iso image is attached to new vm

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (3 diffs)
• UIWizardNewVM.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -133 +133 @@
          * 2. or attach a new (empty) one.
          * 3. and if the unattended install is not enabled
+         * 4. User did not select an ISO image file
          * Usually we are assigning extra-data values through UIExtraDataManager,
          * but in that special case VM was not registered yet, so UIExtraDataManager is unaware of it: */
-        if (!isUnattendedEnabled() &&
+        if (ISOFilePath().isEmpty() &&
+            !isUnattendedEnabled() &&
             !m_virtualDisk.isNull())
             m_machine.SetExtraData(GUI_FirstRun, "yes");
@@ -428 +430 @@
         {
             CMedium opticalDisk;
-            QString strISOFilePath = getStringFieldValue("ISOFilePath");
+            QString strISOFilePath = ISOFilePath();
             if (!strISOFilePath.isEmpty() && !getBoolFieldValue("isUnattendedEnabled"))
             {
-                QFileInfo isoFileInfo(strISOFilePath);
-                if (isoFileInfo.exists() && isoFileInfo.isReadable())
-                {
-                    CVirtualBox vbox = uiCommon().virtualBox();
-                    opticalDisk =
-                        vbox.OpenMedium(strISOFilePath, KDeviceType_DVD,  KAccessMode_ReadWrite, false);
-                    if (!vbox.isOk())
-                        msgCenter().cannotOpenMedium(vbox, strISOFilePath, this);
-                }
+                CVirtualBox vbox = uiCommon().virtualBox();
+                opticalDisk =
+                    vbox.OpenMedium(strISOFilePath, KDeviceType_DVD,  KAccessMode_ReadWrite, false);
+                if (!vbox.isOk())
+                    msgCenter().cannotOpenMedium(vbox, strISOFilePath, this);
             }
             machine.AttachDevice(comDVDController.GetName(), 1, 0, KDeviceType_DVD, opticalDisk);
@@ -634 +632 @@
     setField("installGuestAdditions", m_unattendedInstallData.m_fInstallGuestAdditions);
     setField("guestAdditionsISOPath", m_unattendedInstallData.m_strGuestAdditionsISOPath);
+}
+
+QString UIWizardNewVM::ISOFilePath() const
+{
+    QString strPath = getStringFieldValue("ISOFilePath");
+    if (strPath.isNull() || strPath.isEmpty())
+        return QString();
+    QFileInfo isoFileInfo(strPath);
+    if (isoFileInfo.exists() && isoFileInfo.isReadable())
+        return strPath;
+    return QString();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -130 +130 @@
     QString getNextControllerName(KStorageBus type);
     void setFieldsFromDefaultUnttendedInstallData();
+    /* Returns ISO file path if a readable ISO file is selected. Returns an empty string otherwise. */
+    QString ISOFilePath() const;
 
     /** @name Variables