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

Timestamp:

Mar 7, 2011 1:52:38 PM (14 years ago)

Author:

vboxsync

Message:

Main/Machine: handle the case where snapshot dir = VM dir (previously made VirtualBox switch to the default), and also rename the previous VM config files to reduce clutter.

File:

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

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

@@ -6062 +6062 @@
     strTarget.stripFilename();
     if (RTPathStartsWith(strSource.c_str(), strTarget.c_str()))
+    {
         // is relative: then append what's left
         strTarget = strSource.substr(strTarget.length() + 1); // skip '/'
+        // for empty paths (only possible for subdirs) use "." to avoid
+        // triggering default settings for not present config attributes.
+        if (strTarget.isEmpty())
+            strTarget = ".";
+    }
     else
         // is not relative: then overwrite
@@ -8028 +8034 @@
 
         Utf8Str configFile, newConfigFile;
+        Utf8Str configFilePrev, newConfigFilePrev;
         Utf8Str configDir, newConfigDir;
 
@@ -8093 +8100 @@
                     }
                     fileRenamed = true;
+                    configFilePrev = configFile;
+                    configFilePrev += "-prev";
+                    newConfigFilePrev = newConfigFile;
+                    newConfigFilePrev += "-prev";
+                    RTFileRename(configFilePrev.c_str(), newConfigFilePrev.c_str(), 0);
                 }
             }
@@ -8127 +8139 @@
             /* silently try to rename everything back */
             if (fileRenamed)
+            {
+                RTFileRename(newConfigFilePrev.c_str(), configFilePrev.c_str(), 0);
                 RTFileRename(newConfigFile.c_str(), configFile.c_str(), 0);
+            }
             if (dirRenamed)
                 RTPathRename(newConfigDir.c_str(), configDir.c_str(), 0);