Changeset 78546 in vbox

Timestamp:

May 16, 2019 1:07:34 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6247: VM Settings / Storage page: Make sure controller has valid sub type according to new controller bus type; Besides that pass some valid parent to message-boxes we use there.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -1709 +1709 @@
                         if (!opticalIds.isEmpty())
                         {
-                            if (!msgCenter().confirmStorageBusChangeWithOpticalRemoval())
+                            if (!msgCenter().confirmStorageBusChangeWithOpticalRemoval(qobject_cast<QWidget*>(QObject::parent())))
                                 return false;
                             foreach (const QUuid &uId, opticalIds)
@@ -1724 +1724 @@
                     if (uMaxPortCount * uMaxDevicePerPortCount < (uint)ids.size())
                     {
-                        if (!msgCenter().confirmStorageBusChangeWithExcessiveRemoval())
+                        if (!msgCenter().confirmStorageBusChangeWithExcessiveRemoval(qobject_cast<QWidget*>(QObject::parent())))
                             return false;
                         for (int i = uMaxPortCount * uMaxDevicePerPortCount; i < ids.size(); ++i)
@@ -1730 +1730 @@
                     }
 
-                    /* Push new controller type: */
+                    /* Push new bus/controller type: */
                     pItemController->setCtrBusType(enmNewCtrBusType);
+                    pItemController->setCtrType(pItemController->ctrTypes().first());
                     emit dataChanged(aIndex, aIndex);