Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp	(revision 66539)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp	(revision 66540)
@@ -317,6 +317,6 @@
         {
             /* Prepare old folder data & cache key: */
+            UIDataSettingsSharedFolder oldFolderData;
             QString strFolderKey = QString::number(iFolderIndex);
-            UIDataSettingsSharedFolder oldFolderData;
 
             /* Check whether folder is valid:  */
@@ -933,15 +933,11 @@
             const UISettingsCacheSharedFolder &folderCache = m_pCache->child(iFolderIndex);
 
-            /* Check if this folder data was changed: */
-            if (folderCache.wasChanged())
-            {
-                /* If folder was removed or updated: */
-                if (folderCache.wasRemoved() || folderCache.wasUpdated())
-                    fSuccess = removeSharedFolder(folderCache);
-
-                /* If folder was created or updated: */
-                if (folderCache.wasCreated() || folderCache.wasUpdated())
-                    fSuccess = createSharedFolder(folderCache);
-            }
+            /* Remove folder marked for 'remove' or 'update': */
+            if (folderCache.wasRemoved() || folderCache.wasUpdated())
+                fSuccess = removeSharedFolder(folderCache);
+
+            /* Create folder marked for 'create' or 'update': */
+            if (folderCache.wasCreated() || folderCache.wasUpdated())
+                fSuccess = createSharedFolder(folderCache);
         }
     }