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

Timestamp:

Aug 20, 2013 2:01:53 PM (11 years ago)

Author:

vboxsync

Message:

Main/Machine: fix the code which sets custom icons, and also fix loading of settings

File:

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

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

@@ -7593 +7593 @@
             mUserData.backup();
             com::SafeArray<BYTE> icon(ComSafeArrayInArg(aIcon));
-            mUserData->mIcon.clear();
+            mUserData->mIcon.resize(icon.size());
             memcpy(&mUserData->mIcon[0], icon.raw(), mUserData->mIcon.size());
          }
@@ -8931 +8931 @@
 {
     // copy name, description, OS type, teleporter, UTC etc.
+    mUserData->s = config.machineUserData;
+
+    // Decode the Icon overide data from config userdata and set onto Machine.
     #define DECODE_STR_MAX _1M
-    mUserData->s = config.machineUserData;
-
-    // Decode the Icon overide data from config userdata and set onto Machine.
     const char* pszStr = config.machineUserData.ovIcon.c_str();
     ssize_t cbOut = RTBase64DecodedSize(pszStr, NULL);
@@ -8949 +8949 @@
                         pszStr,
                         rc);
-    COMSETTER(Icon)(ComSafeArrayAsInParam(iconByte));
+    mUserData->mIcon.resize(iconByte.size());
+    memcpy(&mUserData->mIcon[0], iconByte.raw(), mUserData->mIcon.size());
 
     // look up the object by Id to check it is valid