Changeset 87366 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 22, 2021 1:22:18 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Fixes

Location:

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

Files:

• UIWizardNewVMPageBasic2.cpp (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

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

@@ -184 +184 @@
     if (!m_pGAISOFilePathSelector)
         return false;
+    /* GA ISO selector should not be empty since GA install check box is checked at this point: */
     const QString &strPath = m_pGAISOFilePathSelector->path();
     if (strPath.isNull() || strPath.isEmpty())
-        return true;
+        return false;
     QFileInfo fileInfo(strPath);
     if (!fileInfo.exists() || !fileInfo.isReadable())
@@ -195 +196 @@
 void UIWizardNewVMPage2::markWidgets() const
 {
-    if (m_pGAISOFilePathSelector)
+    if (m_pGAISOFilePathSelector && m_pGAInstallCheckBox->isChecked())
         m_pGAISOFilePathSelector->mark(!checkGAISOFile());
 }

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

@@ -313 +313 @@
 {
     UIWizardNewVMPage1::markWidgets();
-
-    if (m_pGAISOFilePathSelector)
-        m_pGAISOFilePathSelector->mark(isUnattendedEnabled() && !checkGAISOFile());
+    UIWizardNewVMPage2::markWidgets();
 }
 
@@ -447 +445 @@
         }
         /* Check the GA installation medium: */
-        if (!checkGAISOFile())
+        if (m_pGAInstallCheckBox->isChecked() && !checkGAISOFile())
         {
             m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Unattended,