Changeset 31218 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 29, 2010 3:07:48 PM (14 years ago)

Author:

vboxsync

Message:

Main: extend Machine::unregister() to no longer fail with machines in 'saved' states, but delete the saved state automatically; remove boolean parameter from IConsole::forgetSavedState() which had to be true for the function to do anything useful anyway; remove corresponding internal sessionmachine method

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageMisc.cpp (modified) (2 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• VirtualBox/src/selector/VBoxSelectorWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -160 +160 @@
     {
         SafeArray<BSTR> abstrFiles;
-        CHECK_ERROR(machine, Unregister(false /* fDetachMedia */,
+        CHECK_ERROR(machine, Unregister(fDelete /* fAutoCleanup */,
                                         ComSafeArrayAsOutParam(abstrFiles)));
-        if (SUCCEEDED(rc) && fDelete)
-            CHECK_ERROR(machine, Delete());
+        if (SUCCEEDED(rc))
+        {
+            for (size_t u = 0;
+                 u < abstrFiles.size();
+                 ++u)
+            {
+                Utf8Str strFile(abstrFiles[u]);
+                if (fDelete)
+                {
+                    RTPrintf("Deleting '%s'\n", strFile.c_str());
+                    RTFileDelete(strFile.c_str());
+                }
+                else
+                    RTPrintf("File '%s' is now obsolete and can be deleted\n", strFile.c_str());
+            }
+
+            if (fDelete)
+            {
+                CHECK_ERROR(machine, Delete());
+            }
+        }
     }
     return SUCCEEDED(rc) ? 0 : 1;
@@ -423 +442 @@
                 ComPtr<IConsole> console;
                 CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam()));
-                CHECK_ERROR_BREAK(console, ForgetSavedState(true));
+                CHECK_ERROR_BREAK(console, ForgetSavedState());
             } while (0);
             CHECK_ERROR_BREAK(a->session, UnlockMachine());

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1652 +1652 @@
         if (machineState == MachineState_Saved)
         {
-            CHECK_ERROR(gConsole, ForgetSavedState(true));
+            CHECK_ERROR(gConsole, ForgetSavedState());
         }
         /*

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -805 +805 @@
 
     CConsole console = session.GetConsole();
-    console.ForgetSavedState(true);
+    console.ForgetSavedState();
     if (!console.isOk())
         vboxProblem().cannotDiscardSavedState (console);