Changeset 24437 in vbox

Timestamp:

Nov 6, 2009 12:30:15 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Need to check if the controller is present before using it

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (5 diffs)

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

@@ -2172 +2172 @@
     foreach (const CMediumAttachment &attachment, attachments)
     {
-        if (attachment.GetType() == deviceType)
+        CStorageController controller = attachment.GetController();
+        if (   !controller.isNull()
+            && (attachment.GetType() == deviceType))
         {
             /* Attachment menu item */
@@ -2179 +2181 @@
             {
                 attachmentMenu = new QMenu (menu);
-                attachmentMenu->setTitle (QString ("%1 (%2)").arg (attachment.GetController().GetName())
-                                          .arg (vboxGlobal().toString (StorageSlot (attachment.GetController().GetBus(),
+                attachmentMenu->setTitle (QString ("%1 (%2)").arg (controller.GetName())
+                                          .arg (vboxGlobal().toString (StorageSlot (controller.GetBus(),
                                                                                     attachment.GetPort(),
                                                                                     attachment.GetDevice()))));
-                switch (attachment.GetController().GetBus())
+                switch (controller.GetBus())
                 {
                     case KStorageBus_IDE:
@@ -2247 +2249 @@
                     mountMediumAction->setCheckable (true);
                     mountMediumAction->setChecked (!currentMedium.isNull() && medium.GetId() == currentId);
-                    mountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
+                    mountMediumAction->setData (QVariant::fromValue (MountTarget (controller.GetName(),
                                                                                   attachment.GetPort(),
                                                                                   attachment.GetDevice(),
@@ -2262 +2264 @@
             QAction *callVMMAction = new QAction (attachmentMenu);
             callVMMAction->setIcon (QIcon (":/diskimage_16px.png"));
-            callVMMAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
+            callVMMAction->setData (QVariant::fromValue (MountTarget (controller.GetName(),
                                                                       attachment.GetPort(),
                                                                       attachment.GetDevice(),
@@ -2276 +2278 @@
             QAction *unmountMediumAction = new QAction (attachmentMenu);
             unmountMediumAction->setEnabled (!currentMedium.isNull());
-            unmountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
+            unmountMediumAction->setData (QVariant::fromValue (MountTarget (controller.GetName(),
                                                                             attachment.GetPort(),
                                                                             attachment.GetDevice())));