Changeset 11832 in vbox for trunk/src

Timestamp:

Aug 29, 2008 3:35:21 PM (16 years ago)

Author:

vboxsync

Message:

Main: call DiscardSettings() before saving guest properties in order to avoid saving any undesired temporary settings

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4400 +4400 @@
     }
     if (RT_SUCCESS(vrc) || (VERR_TOO_MUCH_DATA == vrc))
+    {
+        /* PushGuestProperties() calls DiscardSettings(), which calls us back */
+        alock.leave();
         mControl->PushGuestProperties(ComSafeArrayAsInParam (names),
                                       ComSafeArrayAsInParam (values),
                                       ComSafeArrayAsInParam (timestamps),
                                       ComSafeArrayAsInParam (flags));
+        alock.enter();
+    }
 # endif /* VBOX_WITH_GUEST_PROPS defined */
 #endif /* VBOX_WITH_HGCM */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8991 +8991 @@
     com::SafeArray <ULONG64> timestamps(ComSafeArrayInArg(aTimestamps));
     com::SafeArray <INPTR BSTR> flags(ComSafeArrayInArg(aFlags));
+    DiscardSettings();
     mHWData.backup();
     mHWData->mGuestProperties.erase(mHWData->mGuestProperties.begin(),