Changeset 12113 in vbox

Timestamp:

Sep 4, 2008 10:55:13 PM (16 years ago)

Author:

vboxsync

Message:

VirtualBox4: Killed some more USB assertions for when VBOX_WITH_USB isn't defined.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsUSB.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsUSB.cpp

@@ -178 +178 @@
 
     CUSBController ctl = aMachine.GetUSBController();
-    mGbUSB->setChecked (ctl.GetEnabled());
-    mCbUSB2->setChecked (ctl.GetEnabledEhci());
+    mGbUSB->setChecked (!ctl.isNull() && ctl.GetEnabled());
+    mCbUSB2->setChecked (!ctl.isNull() && ctl.GetEnabledEhci());
     usbAdapterToggled (mGbUSB->isChecked());
 
-    CUSBDeviceFilterEnumerator en = ctl.GetDeviceFilters().Enumerate();
-    while (en.HasMore())
-        addUSBFilter (en.GetNext(), false /* isNew */);
+    if (!ctl.isNull())
+    {
+        CUSBDeviceFilterEnumerator en = ctl.GetDeviceFilters().Enumerate();
+        while (en.HasMore())
+            addUSBFilter (en.GetNext(), false /* isNew */);
+    }
 
     mTwFilters->setCurrentItem (mTwFilters->topLevelItem (0));
@@ -192 +195 @@
 void VBoxVMSettingsUSB::putBackTo()
 {
-    CUSBController ctl = mMachine.GetUSBController();
-
-    ctl.SetEnabled (mGbUSB->isChecked());
-    ctl.SetEnabledEhci (mCbUSB2->isChecked());
-
-    if (mUSBFilterListModified)
-    {
-        /* First, remove all old filters */
-        for (ulong count = ctl.GetDeviceFilters().GetCount(); count; -- count)
-            ctl.RemoveDeviceFilter (0);
-
-        /* Then add all new filters */
-        for (int i = 0; i < mFilters.size(); ++ i)
-        {
-            CUSBDeviceFilter filter = mFilters [i];
-            filter.SetActive (mTwFilters->topLevelItem (i)->
-                checkState (0) == Qt::Checked);
-            ctl.InsertDeviceFilter (~0, filter);
-        }
-    }
-
+    CUSBController ctl = mMachine.GetUSBController(); 
+    if (!ctl.isNull())
+    {
+        ctl.SetEnabled (mGbUSB->isChecked());
+        ctl.SetEnabledEhci (mCbUSB2->isChecked());
+
+        if (mUSBFilterListModified)
+        {
+            /* First, remove all old filters */
+            for (ulong count = ctl.GetDeviceFilters().GetCount(); count; -- count)
+                ctl.RemoveDeviceFilter (0);
+
+            /* Then add all new filters */
+            for (int i = 0; i < mFilters.size(); ++ i)
+            {
+                CUSBDeviceFilter filter = mFilters [i];
+                filter.SetActive (mTwFilters->topLevelItem (i)->
+                    checkState (0) == Qt::Checked);
+                ctl.InsertDeviceFilter (~0, filter);
+            }
+        }
+    }
     mUSBFilterListModified = false;
 }
@@ -323 +327 @@
     else if (mType == MachineType)
     {
-        filter = mMachine.GetUSBController()
-            .CreateDeviceFilter (mUSBFilterName.arg (maxFilterIndex + 1));
+        CUSBController ctl = mMachine.GetUSBController();
+        if (ctl.isNull())
+            return;
+        filter = ctl.CreateDeviceFilter (mUSBFilterName.arg (maxFilterIndex + 1));
     }
     else
@@ -362 +368 @@
     else if (mType == MachineType)
     {
-        filter = mMachine.GetUSBController()
-            .CreateDeviceFilter (vboxGlobal().details (usb));
+        CUSBController ctl = mMachine.GetUSBController();
+        if (ctl.isNull())
+            return;
+        filter = ctl.CreateDeviceFilter (vboxGlobal().details (usb));
     }
     else