Changeset 21777 in vbox

Timestamp:

Jul 23, 2009 2:23:34 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 2703: FE/Qt4: ISO unmounting broken - Warn user if unmounting procedure failed.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -263 +263 @@
     void cannotCloseMedium (QWidget *aParent, const VBoxMedium &aMedium,
                             const COMResult &aResult);
+    void cannotEjectDrive();
 
     void cannotOpenSession (const CSession &session);

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

@@ -2844 +2844 @@
         }
     }
+
+    if (drv.GetState() != KDriveState_NotMounted)
+    {
+        /* Looks like Main make no force unmounting here
+         * but IFloppyDrive::Unmount() is called synchronously.
+         * Also Main performs rollback for this procedure if
+         * it was failed by some reason - for example if the
+         * guest OS locked IFloppyDrive preventing image from
+         * unmounting - so no way to know the error was really
+         * occured. Thats why we just checking the drive state
+         * and warn a user about problem if present. */
+        vboxProblem().cannotEjectDrive();
+    }
 }
 
@@ -2892 +2905 @@
                 vboxProblem().cannotSaveMachineSettings (m);
         }
+    }
+
+    if (drv.GetState() != KDriveState_NotMounted)
+    {
+        /* Looks like Main make no force unmounting here
+         * but IDVDDrive::Unmount() is called synchronously.
+         * Also Main performs rollback for this procedure if
+         * it was failed by some reason - for example if the
+         * guest OS locked IDVDDrive preventing image from
+         * unmounting - so no way to know the error was really
+         * occured. Thats why we just checking the drive state
+         * and warn a user about problem if present. */
+        vboxProblem().cannotEjectDrive();
     }
 }

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

@@ -1202 +1202 @@
 }
 
+void VBoxProblemReporter::cannotEjectDrive()
+{
+    message (mainWindowShown(), Warning,
+             tr ("Failed to eject the disk from the virtual drive. "
+                 "The drive may be locked by the guest operating system. "
+                 "Please check this and try again."));
+}
+
 void VBoxProblemReporter::cannotOpenSession (const CSession &session)
 {