Changeset 27761 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Mar 26, 2010 9:48:25 PM (15 years ago)

Author:

vboxsync

Message:

Main: fixed saving guest properties at machine power off

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -184 +184 @@
     mSyntheticCpu = false;
     mPropertyServiceActive = false;
+    mGuestPropertiesModified = false;
     mHpetEnabled = false;
 
@@ -7663 +7664 @@
             HWData::GuestProperty property = *it;
 
+            /* Remove transient guest properties at shutdown unless we
+             * are saving state */
+            if (   (   mData->mMachineState == MachineState_PoweredOff
+                    || mData->mMachineState == MachineState_Aborted
+                    || mData->mMachineState == MachineState_Teleported)
+                && property.mFlags & guestProp::TRANSIENT)
+                continue;
             settings::GuestProperty prop;
             prop.strName = property.strName;
@@ -7675 +7683 @@
 
         data.strNotificationPatterns = mHWData->mGuestPropertyNotificationPatterns;
+        /* I presume this doesn't require a backup(). */
+        mHWData->mGuestPropertiesModified = false;
 #endif /* VBOX_WITH_GUEST_PROPS defined */
     }
@@ -9963 +9973 @@
             {
                 mHWData->mGuestProperties.erase(iter);
+                mHWData->mGuestPropertiesModified = true;
                 break;
             }
@@ -9969 +9980 @@
             HWData::GuestProperty property = { aName, aValue, aTimestamp, fFlags };
             mHWData->mGuestProperties.push_back(property);
+            mHWData->mGuestPropertiesModified = true;
         }
 
@@ -10793 +10805 @@
     }
 
+    if (   aMachineState == MachineState_PoweredOff
+        || aMachineState == MachineState_Aborted
+        || aMachineState == MachineState_Teleported)
+    {
+        /* Make sure any transient guest properties get removed from the
+         * property store on shutdown. */
+        
+        HWData::GuestPropertyList::iterator it;
+        BOOL fNeedsSaving = mHWData->mGuestPropertiesModified;
+        if (!fNeedsSaving)
+            for (it = mHWData->mGuestProperties.begin();
+                 it != mHWData->mGuestProperties.end(); ++it)
+                if (it->mFlags & guestProp::TRANSIENT)
+                {
+                    fNeedsSaving = true;
+                    break;
+                }
+        if (fNeedsSaving)
+        {
+            mData->mCurrentStateModified = TRUE;
+            stsFlags |= SaveSTS_CurStateModified;
+            SaveSettings();
+        }
+    }
+
     rc = saveStateSettings(stsFlags);