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

Timestamp:

Feb 26, 2015 8:45:50 AM (10 years ago)

Author:

vboxsync

Message:

VBoxManageControlVM: explicitly call SaveMachine for a few more functions

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (6 diffs)

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

@@ -85 +85 @@
 {
     using namespace com;
+    bool fNeedsSaving = false;
     HRESULT rc;
 
@@ -100 +101 @@
     CHECK_ERROR_RET(machine, LockMachine(a->session, LockType_Shared), 1);
 
+    ComPtr<IConsole> console;
+    ComPtr<IMachine> sessionMachine;
+
     do
     {
         /* get the associated console */
-        ComPtr<IConsole> console;
         CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam()));
         /* ... and session machine */
-        ComPtr<IMachine> sessionMachine;
         CHECK_ERROR_BREAK(a->session, COMGETTER(Machine)(sessionMachine.asOutParam()));
 
@@ -561 +563 @@
 #undef ITERATE_TO_NEXT_TERM
             }
-            /* commit changes */
             if (SUCCEEDED(rc))
-                CHECK_ERROR(sessionMachine, SaveSettings());
+                fNeedsSaving = true;
         }
         else if (!strncmp(a->argv[1], "nicproperty", 11))
@@ -603 +604 @@
                             Bstr bstrValue = &pDelimiter[1];
                             CHECK_ERROR(adapter, SetProperty(bstrName.raw(), bstrValue.raw()));
+                            if (SUCCEEDED(rc))
+                                fNeedsSaving = true;
                         }
                         else
@@ -665 +668 @@
 
                     CHECK_ERROR(adapter, COMSETTER(PromiscModePolicy)(enmPromiscModePolicy));
+                    if (SUCCEEDED(rc))
+                        fNeedsSaving = true;
                 }
                 else
@@ -1663 +1668 @@
     } while (0);
 
+    /* The client has to trigger saving the state explicitely. */
+    if (fNeedsSaving)
+        CHECK_ERROR(sessionMachine, SaveSettings());
+
     a->session->UnlockMachine();