Changeset 78392 in vbox for trunk/src/VBox

Timestamp:

May 6, 2019 2:41:45 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400. Reattaching the medium even if medium type change fails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumItem.cpp (modified) (1 diff)
• UIMediumManager.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

@@ -232 +232 @@
     /* Attempt to change medium type: */
     comMedium.SetType(enmNewType);
-
+    bool fSuccess = true;
     /* Show error message if necessary: */
     if (!comMedium.isOk() && parentTree())
     {
         msgCenter().cannotChangeMediumType(comMedium, enmOldType, enmNewType, treeWidget());
-        return false;
+        fSuccess = false;
     }
     /* Reattach the medium to all the vms it was previously attached: */
     foreach (const AttachmentCache &attachmentCache, attachmentCacheList)
         attachTo(attachmentCache);
-    return true;
+    return fSuccess;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -273 +273 @@
     if (   comMedium.isOk()
         && newData.m_options.m_enmMediumType != oldData.m_options.m_enmMediumType)
-    {
         pMediumItem->changeMediumType(oldData.m_options.m_enmMediumType, newData.m_options.m_enmMediumType);
-    }
 
     /* Try to assign new medium location: */
@@ -1046 +1044 @@
     {
         m_pDetailsWidget->setData(pMediumItem ? *pMediumItem : UIDataMedium(type));
-        if (pMediumItem)
+        if (pMediumItem && currentMediumItem())
             m_pDetailsWidget->enableDisableMediumModificationWidgets(currentMediumItem()->isMediumModifiable());
     }