Changeset 96137 in vbox for trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp

Timestamp:

Aug 11, 2022 2:35:45 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Propagate errors further up, to let clients ask IRecordingSettings directly what actually went wrong via IVirtualBoxErrorInfo. ​bugref:10275

File:

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

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

@@ -246 +246 @@
     const bool fEnabled = RT_BOOL(enable);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (m->bd->fEnabled != fEnabled)
@@ -255 +255 @@
         alock.release();
 
-        rc = m->pMachine->i_onRecordingChange(enable);
-        if (FAILED(rc))
-        {
+        hrc = m->pMachine->i_onRecordingChange(enable);
+        if (FAILED(hrc))
+        {
+            com::ErrorInfo errMachine; /* Get error info from machine call above. */
+
             /*
              * Normally we would do the actual change _after_ i_onRecordingChange() succeeded.
@@ -266 +268 @@
             alock.acquire();
             m->bd->fEnabled = m->bd.backedUpData()->fEnabled;
+
+            if (errMachine.isBasicAvailable())
+                hrc = setError(errMachine);
         }
         else
@@ -278 +283 @@
             /** Save settings if online - @todo why is this required? -- @bugref{6818} */
             if (Global::IsOnline(m->pMachine->i_getMachineState()))
-                rc = m->pMachine->i_saveSettings(NULL, mlock);
-        }
-    }
-
-    return rc;
+            {
+                com::ErrorInfo errMachine;
+                hrc = m->pMachine->i_saveSettings(NULL, mlock);
+                if (FAILED(hrc))
+                {
+                    /* Got error info from machine call above. */
+                    if (errMachine.isBasicAvailable())
+                        hrc = setError(errMachine);
+                }
+            }
+        }
+    }
+
+    return hrc;
 }