Changeset 618 in vbox

Timestamp:

Feb 5, 2007 8:48:21 AM (18 years ago)

Author:

vboxsync

Message:

fixed USB assertion in OSE

File:

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

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

@@ -580 +580 @@
 
     /* initialize usb stuff */
-    bool isUSBEnabled = cmachine.GetUSBController().GetEnabled();
-    devicesUSBMenu->setEnabled (isUSBEnabled);
-    usb_light->setState (isUSBEnabled ? CEnums::DeviceIdle
+    CUSBController usbctl = cmachine.GetUSBController();
+    if (!usbctl.isNull())
+    {
+        bool isUSBEnabled =  usbctl.GetEnabled();
+        devicesUSBMenu->setEnabled (isUSBEnabled);
+        usb_light->setState (isUSBEnabled ? CEnums::DeviceIdle
                                       : CEnums::InvalidActivity);
-    mUsbLedTip = new VBoxUSBLedTip (usb_light, cconsole, isUSBEnabled);
+        mUsbLedTip = new VBoxUSBLedTip (usb_light, cconsole, isUSBEnabled);
+    }
 
     /* start an idle timer that will update device lighths */
@@ -1295 +1299 @@
         /// @todo (r=dmik) do we really need to disable the control while
         //  in Pause? Check the same for CD/DVD above.
-        if (mUsbLedTip->isUSBEnabled())
+        if (mUsbLedTip && mUsbLedTip->isUSBEnabled())
             devicesUSBMenu->setEnabled (machine_state == CEnums::Running);
     }