Changeset 34950 in vbox

Timestamp:

Dec 10, 2010 1:40:43 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Fix additions mounting routine.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -450 +450 @@
         if (!strCntName.isNull())
         {
-            bool fIsMounted = false;
-
-            VBoxMedium vmedium = vboxGlobal().findMedium(strUuid);
-            CMedium medium = vmedium.medium();              // @todo r=dj can this be cached somewhere?
-
-            /* Mount medium to the predefined port/device */
-            machine.MountMedium(strCntName, iCntPort, iCntDevice, medium, false /* force */);
-            if (machine.isOk())
-                fIsMounted = true;
-            else
+            /* Create a new VBoxMedium: */
+            VBoxMedium vboxMedium(image, VBoxDefs::MediumType_DVD, KMediumState_Created);
+            /* Register it in GUI internal list: */
+            vboxGlobal().addMedium(vboxMedium);
+
+            /* Mount medium to the predefined port/device: */
+            machine.MountMedium(strCntName, iCntPort, iCntDevice, vboxMedium.medium(), false /* force */);
+            if (!machine.isOk())
             {
-                /* Ask for force mounting */
-                if (vboxProblem().cannotRemountMedium(0, machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
-                                                      true /* mount? */, true /* retry? */) == QIMessageBox::Ok)
+                /* Ask for force mounting: */
+                if (vboxProblem().cannotRemountMedium(0, machine, vboxMedium, true /* mount? */, true /* retry? */) == QIMessageBox::Ok)
                 {
-                    /* Force mount medium to the predefined port/device */
-                    machine.MountMedium(strCntName, iCntPort, iCntDevice, medium, true /* force */);
-                    if (machine.isOk())
-                        fIsMounted = true;
-                    else
-                        vboxProblem().cannotRemountMedium(0, machine, VBoxMedium(image, VBoxDefs::MediumType_DVD),
-                                                          true /* mount? */, false /* retry? */);
+                    /* Force mount medium to the predefined port/device: */
+                    machine.MountMedium(strCntName, iCntPort, iCntDevice, vboxMedium.medium(), true /* force */);
+                    if (!machine.isOk())
+                        vboxProblem().cannotRemountMedium(0, machine, vboxMedium, true /* mount? */, false /* retry? */);
                 }
             }