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

Timestamp:

Jun 14, 2011 2:40:45 PM (14 years ago)

Author:

vboxsync

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

72251

Message:

FE/Qt: Do not add cloned medium into internal registry, closing it at the end.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (1 diff)
• wizards/newhd/UINewHDWizard.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp

@@ -1055 +1055 @@
                          0 /* default size, not important for copying */,
                          pItem->medium().medium() /* base medium for copying */);
-
-    if (wizard.exec() == QDialog::Accepted)
-    {
-        /* Search for the newly created hard disk: */
-        MediaItem *pItem = searchItem(mTwHD, wizard.hardDisk().GetId());
-        AssertReturnVoid(pItem);
-        /* Select the newly created hard disk: */
-        mTwHD->setCurrentItem(pItem);
-    }
+    wizard.exec();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newhd/UINewHDWizard.cpp

@@ -969 +969 @@
     }
 
-    /* Inform everybody there is a new medium: */
+    /* Assign hardDisk field value: */
     m_hardDisk = hardDisk;
-    vboxGlobal().addMedium(VBoxMedium(m_hardDisk, VBoxDefs::MediumType_HardDisk, KMediumState_Created));
+
+    /* Depending on dialog type: */
+    switch (wizardType())
+    {
+        case UINewHDWizardType_Creating:
+        {
+            /* Inform everybody there is a new medium: */
+            vboxGlobal().addMedium(VBoxMedium(m_hardDisk, VBoxDefs::MediumType_HardDisk, KMediumState_Created));
+            break;
+        }
+        case UINewHDWizardType_Copying:
+        {
+            /* Just close the clone medium, it is not necessary yet: */
+            m_hardDisk.Close();
+            break;
+        }
+        default:
+            return false;
+    }
 
     return true;