Changeset 45583 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2013 8:55:05 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Clone VD wizard: Make sure it will not crash even if there are no available medium-formats. Asserts in that case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd

Files:

• UIWizardCloneVDPageBasic2.cpp (modified) (2 diffs)
• UIWizardCloneVDPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

@@ -104 +104 @@
                         addFormatButton(this, pFormatLayout, medFormat);
                 }
-                m_pFormatButtonGroup->button(0)->click();
-                m_pFormatButtonGroup->button(0)->setFocus();
+                if (!m_pFormatButtonGroup->buttons().isEmpty())
+                {
+                    m_pFormatButtonGroup->button(0)->click();
+                    m_pFormatButtonGroup->button(0)->setFocus();
+                }
             }
         }
@@ -154 +157 @@
 {
     /* Show variant page only if there is something to show: */
-    CMediumFormat medFormat = mediumFormat();
-//    ULONG uCapabilities = medFormat.GetCapabilities();
-    ULONG uCapabilities = 0;
-    QVector<KMediumFormatCapabilities> capabilities;
-    capabilities = medFormat.GetCapabilities();
-    for (int i = 0; i < capabilities.size(); i++)
-        uCapabilities |= capabilities[i];
+    CMediumFormat mf = mediumFormat();
+    if (mf.isNull())
+    {
+        AssertMsgFailed(("No medium format set!"));
+    }
+    else
+    {
+        ULONG uCapabilities = 0;
+        QVector<KMediumFormatCapabilities> capabilities;
+        capabilities = mf.GetCapabilities();
+        for (int i = 0; i < capabilities.size(); i++)
+            uCapabilities |= capabilities[i];
 
-    int cTest = 0;
-    if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)
-        ++cTest;
-    if (uCapabilities & KMediumFormatCapabilities_CreateFixed)
-        ++cTest;
-    if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G)
-        ++cTest;
-    if (cTest > 1)
-        return UIWizardCloneVD::Page3;
+        int cTest = 0;
+        if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)
+            ++cTest;
+        if (uCapabilities & KMediumFormatCapabilities_CreateFixed)
+            ++cTest;
+        if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G)
+            ++cTest;
+        if (cTest > 1)
+            return UIWizardCloneVD::Page3;
+    }
     /* Skip otherwise: */
     return UIWizardCloneVD::Page4;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -103 +103 @@
                             addFormatButton(m_pFormatCnt, pFormatCntLayout, medFormat);
                     }
-                    m_pFormatButtonGroup->button(0)->click();
-                    m_pFormatButtonGroup->button(0)->setFocus();
+                    if (!m_pFormatButtonGroup->buttons().isEmpty())
+                    {
+                        m_pFormatButtonGroup->button(0)->click();
+                        m_pFormatButtonGroup->button(0)->setFocus();
+                    }
                 }
             }
@@ -186 +189 @@
     /* Get medium format: */
     CMediumFormat mf = mediumFormat();
+    if (mf.isNull())
+    {
+        AssertMsgFailed(("No medium format set!"));
+        return;
+    }
 
     /* Enable/disable widgets: */