Index: /trunk/src/VBox/Main/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/MachineImpl.cpp	(revision 31306)
+++ /trunk/src/VBox/Main/MachineImpl.cpp	(revision 31307)
@@ -8157,5 +8157,6 @@
  * machine and a new set of attachments to refer to created disks.
  *
- * Used when taking a snapshot or when deleting the current state.
+ * Used when taking a snapshot or when deleting the current state. Gets called
+ * from SessionMachine::BeginTakingSnapshot() and SessionMachine::restoreSnapshotHandler().
  *
  * This method assumes that mMediaData contains the original hard disk attachments
@@ -8173,5 +8174,4 @@
  * writing if this method succeeds.
  *
- * @param aFolder           Folder where to create diff hard disks.
  * @param aProgress         Progress object to run (must contain at least as
  *                          many operations left as the number of hard disks
@@ -8186,13 +8186,10 @@
  * @note Locks this object for writing.
  */
-HRESULT Machine::createImplicitDiffs(const Bstr &aFolder,
-                                     IProgress *aProgress,
+HRESULT Machine::createImplicitDiffs(IProgress *aProgress,
                                      ULONG aWeight,
                                      bool aOnline,
                                      bool *pfNeedsSaveSettings)
 {
-    AssertReturn(!aFolder.isEmpty(), E_FAIL);
-
-    LogFlowThisFunc(("aFolder='%ls', aOnline=%d\n", aFolder.raw(), aOnline));
+    LogFlowThisFunc(("aOnline=%d\n", aOnline));
 
     AutoCaller autoCaller(this);
Index: /trunk/src/VBox/Main/SnapshotImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/SnapshotImpl.cpp	(revision 31306)
+++ /trunk/src/VBox/Main/SnapshotImpl.cpp	(revision 31307)
@@ -1432,6 +1432,5 @@
 
         /* create new differencing hard disks and attach them to this machine */
-        rc = createImplicitDiffs(mUserData->mSnapshotFolderFull,
-                                 aConsoleProgress,
+        rc = createImplicitDiffs(aConsoleProgress,
                                  1,            // operation weight; must be the same as in Console::TakeSnapshot()
                                  !!fTakingSnapshotOnline,
@@ -1831,6 +1830,5 @@
             alock.leave();
 
-            rc = createImplicitDiffs(mUserData->mSnapshotFolderFull,
-                                     aTask.pProgress,
+            rc = createImplicitDiffs(aTask.pProgress,
                                      1,
                                      false /* aOnline */,
Index: /trunk/src/VBox/Main/include/MachineImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/MachineImpl.h	(revision 31306)
+++ /trunk/src/VBox/Main/include/MachineImpl.h	(revision 31307)
@@ -760,6 +760,5 @@
     HRESULT saveStateSettings(int aFlags);
 
-    HRESULT createImplicitDiffs(const Bstr &aFolder,
-                                IProgress *aProgress,
+    HRESULT createImplicitDiffs(IProgress *aProgress,
                                 ULONG aWeight,
                                 bool aOnline,