Changeset 23308 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 24, 2009 7:39:07 PM (15 years ago)

Author:

vboxsync

Message:

fix OSE

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1609 +1609 @@
 HRESULT Host::loadSettings(const settings::Host &data)
 {
+    HRESULT rc = S_OK;
+#ifdef VBOX_WITH_USB
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -1614 +1616 @@
     AutoMultiWriteLock2 alock(this->lockHandle(), &m->treeLock);
 
-    HRESULT rc = S_OK;
-
-#ifdef VBOX_WITH_USB
+
     for (settings::USBDeviceFiltersList::const_iterator it = data.llUSBDeviceFilters.begin();
          it != data.llUSBDeviceFilters.end();
@@ -1640 +1640 @@
     NOREF(data);
 #endif /* VBOX_WITH_USB */
-
     return rc;
 }
@@ -1646 +1645 @@
 HRESULT Host::saveSettings(settings::Host &data)
 {
+#ifdef VBOX_WITH_USB
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -1651 +1651 @@
     AutoReadLock alock(&m->treeLock);
 
-#ifdef VBOX_WITH_USB
     data.llUSBDeviceFilters.clear();