Changeset 5774 in vbox

Timestamp:

Nov 16, 2007 3:34:20 PM (17 years ago)

Author:

vboxsync

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

26166

Message:

FE/Qt: Fixed a regression (would unregister an inaccessible hard disk even if the user chose Cancel in the confirmation dialog).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -186 +186 @@
     void cannotDeleteHardDiskImage (QWidget *parent, const CVirtualDiskImage &vdi);
 
-    int confirmHardDiskUnregister (QWidget *parent, const QString &src);
+    bool confirmHardDiskUnregister (QWidget *parent, const QString &src);
 
     void cannotCreateHardDiskImage (

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

@@ -1011 +1011 @@
 }
 
-int VBoxProblemReporter::confirmHardDiskUnregister (QWidget *parent,
+bool VBoxProblemReporter::confirmHardDiskUnregister (QWidget *parent,
                                                     const QString &src)
 {

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -2017 +2017 @@
     {
         type = VBoxDefs::HD;
-        int deleteImage;
+        bool deleteImage = false;
+
         /// @todo When creation of VMDK is implemented, we should
         /// enable image deletion for  them as well (use
@@ -2024 +2025 @@
         if (disk.GetStorageType() == CEnums::VirtualDiskImage &&
             item->getStatus() == VBoxMedia::Ok)
-            deleteImage = vboxProblem().confirmHardDiskImageDeletion (this, src);
+        {
+            int rc = vboxProblem().confirmHardDiskImageDeletion (this, src);
+            if (rc == QIMessageBox::Cancel)
+                return;
+            deleteImage = rc == QIMessageBox::Yes;
+        }
         else
-            deleteImage = vboxProblem().confirmHardDiskUnregister (this, src);
-        if (deleteImage == QIMessageBox::Cancel)
-            return;
+        {
+            if (!vboxProblem().confirmHardDiskUnregister (this, src))
+                return;
+        }
+
         CHardDisk hd = vbox.UnregisterHardDisk (uuid);
-        if (vbox.isOk() && deleteImage == QIMessageBox::Yes)
+        if (!vbox.isOk())
+            vboxProblem().cannotUnregisterMedia (this, vbox, type, src);
+        else if (deleteImage)
         {
             /// @todo When creation of VMDK is implemented, we should