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

Timestamp:

Aug 4, 2008 8:44:56 AM (16 years ago)

Author:

vboxsync

Message:

Main: (guest properties) fix a burn and add an explanatory comment

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2710 +2710 @@
 
     using namespace guestProp;
-    rc = E_FAIL;
+    HRESULT rc = E_FAIL;
 
     if (!mHWData->mPropertyServiceActive)
@@ -2947 +2947 @@
 
     using namespace guestProp;
-    rc = E_FAIL;
+    HRESULT rc = E_FAIL;
 
     if (!mHWData->mPropertyServiceActive)
@@ -8935 +8935 @@
     AutoWriteLock alock (this);
 
+    /* Temporarily reset the registered flag, so that our machine state
+     * changes (i.e. mHWData.backup()) succeed.  (isMutable() used in
+     * all setters will return FALSE for a Machine instance if mRegistered
+     * is TRUE).  This is copied from registeredInit(), and may or may not be
+     * the right way to handle this. */
     mData->mRegistered = FALSE;
     HRESULT rc = checkStateDependency (MutableStateDep);
@@ -8962 +8967 @@
     alock.unlock();
     SaveSettings();
+    /* Restore the mRegistered flag. */
     mData->mRegistered = TRUE;
     return S_OK;