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

Timestamp:

Oct 31, 2014 3:27:13 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96713

Message:

MachineImpl: delete TRANSIENT and TRANSRESET guest properties on VM shutdown.

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -14270 +14270 @@
         /* Make sure any transient guest properties get removed from the
          * property store on shutdown. */
-
-        HWData::GuestPropertyMap::const_iterator it;
         BOOL fNeedsSaving = mData->mGuestPropertiesModified;
-        if (!fNeedsSaving)
-            for (it = mHWData->mGuestProperties.begin();
-                 it != mHWData->mGuestProperties.end(); ++it)
-                if (   (it->second.mFlags & guestProp::TRANSIENT)
-                    || (it->second.mFlags & guestProp::TRANSRESET))
-                {
-                    fNeedsSaving = true;
-                    break;
-                }
+
+        settings::GuestPropertiesList &llGuestProperties = mData->pMachineConfigFile->hardwareMachine.llGuestProperties;
+        settings::GuestPropertiesList::const_iterator it = llGuestProperties.begin();
+        while (it != llGuestProperties.end())
+        {
+            const settings::GuestProperty &prop = *it;
+            if (   prop.strFlags.contains("TRANSRESET", Utf8Str::CaseInsensitive)
+                || prop.strFlags.contains("TRANSIENT", Utf8Str::CaseInsensitive))
+            {
+                it = llGuestProperties.erase(it);
+                fNeedsSaving = true;
+            }
+            else
+            {
+                ++it;
+            }
+        }
+
         if (fNeedsSaving)
         {
@@ -14288 +14295 @@
         }
     }
-#endif
+#endif /* VBOX_WITH_GUEST_PROPS */
 
     rc = i_saveStateSettings(stsFlags);