Changeset 45909 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 6, 2013 1:26:33 PM (12 years ago)

Author:

vboxsync

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

85537

Message:

Main: don't create a guest property if it does not exist and should be removed

File:

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

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

@@ -5752 +5752 @@
         Utf8Str utf8Flags(aFlags);
         uint32_t fFlags = NILFLAG;
-        if (   (aFlags != NULL)
-            && RT_FAILURE(validateFlags(utf8Flags.c_str(), &fFlags))
-           )
+        if (   aFlags != NULL
+            && RT_FAILURE(validateFlags(utf8Flags.c_str(), &fFlags)))
             return setError(E_INVALIDARG,
                             tr("Invalid guest property flag values: '%ls'"),
                             aFlags);
 
+        bool fDelete = !RT_VALID_PTR(aValue) || *(aValue) == '\0';
         HWData::GuestPropertyMap::iterator it =
             mHWData->mGuestProperties.find(utf8Name);
@@ -5764 +5764 @@
         if (it == mHWData->mGuestProperties.end())
         {
-            setModified(IsModified_MachineData);
-            mHWData.backupEx();
-
-            RTTIMESPEC time;
-            HWData::GuestProperty prop;
-            prop.strValue = aValue;
-            prop.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
-            prop.mFlags = fFlags;
-
-            mHWData->mGuestProperties[Utf8Str(aName)] = prop;
+            /* only create the new property if this is really desired */
+            if (!fDelete)
+            {
+                setModified(IsModified_MachineData);
+                mHWData.backupEx();
+
+                RTTIMESPEC time;
+                HWData::GuestProperty prop;
+                prop.strValue = aValue;
+                prop.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
+                prop.mFlags = fFlags;
+
+                mHWData->mGuestProperties[Utf8Str(aName)] = prop;
+            }
         }
         else
@@ -5793 +5797 @@
                 Assert(it != mHWData->mGuestProperties.end());
 
-                if (RT_VALID_PTR(aValue) && *(aValue) != '\0')
+                if (!fDelete)
                 {
                     RTTIMESPEC time;