Changeset 34982 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 13, 2010 9:29:24 AM (14 years ago)

Author:

vboxsync

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

68805

Message:

FE/Qt: 5391: Do not offer to delete a medium (while trying to remove it using VMM) if medium is not file-based.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (1 diff)
• globals/VBoxProblemReporter.cpp (modified) (2 diffs)

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

@@ -1064 +1064 @@
              * will give a corresponding hint. Therefore, once the code is
              * changed below, the hint should be re-checked for validity. */
-            if (item->state() != KMediumState_Inaccessible)
+            if (item->state() != KMediumState_Inaccessible &&
+                item->medium().medium().GetMediumFormat().GetCapabilities() & MediumFormatCapabilities_File)
             {
                 int rc = vboxProblem().

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

@@ -1116 +1116 @@
             .arg (aMedium.location());
 
-    if (aMedium.type() == VBoxDefs::MediumType_HardDisk)
+    if (aMedium.type() == VBoxDefs::MediumType_HardDisk &&
+        aMedium.medium().GetMediumFormat().GetCapabilities() & MediumFormatCapabilities_File)
     {
         if (aMedium.state() == KMediumState_Inaccessible)
@@ -1131 +1132 @@
         msg +=
             tr ("<p>Note that the storage unit of this medium will not be "
-                "deleted and that it will be possible to add it to "
-                "the list later again.</p>");
+                "deleted and that it will be possible to use it later again.</p>");
 
     return messageOkCancel (aParent, Question, msg,