Changeset 34791 in vbox

Timestamp:

Dec 7, 2010 3:01:15 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: close IMedium on delete

File:

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

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

@@ -1077 +1077 @@
             if (deleteStorage)
             {
-                bool success = false;
-
                 CProgress progress = hardDisk.DeleteStorage();
                 if (hardDisk.isOk())
                 {
-                    vboxProblem().showModalProgressDialog (progress, windowTitle(), ":/progress_delete_90px.png", this, true);
-                    if (progress.isOk() && progress.GetResultCode() == S_OK)
-                        success = true;
+                    vboxProblem().showModalProgressDialog(progress, windowTitle(), ":/progress_delete_90px.png", this, true);
+                    if (!(progress.isOk() && progress.GetResultCode() == S_OK))
+                    {
+                        vboxProblem().cannotDeleteHardDiskStorage(this, hardDisk, progress);
+                        return;
+                    }
                 }
-
-                if (success)
-                    vboxGlobal().removeMedium (VBoxDefs::MediumType_HardDisk, id);
-                else
-                    vboxProblem().cannotDeleteHardDiskStorage (this, hardDisk, progress);
-
-                /* We don't want to close the hard disk because it was
-                 * implicitly closed and removed from the list of known media
-                 * on storage deletion */
-                return;
             }