Changeset 46825 in vbox for trunk

Timestamp:

Jun 27, 2013 10:23:20 AM (12 years ago)

Author:

vboxsync

Message:

Main/VPX: error handling

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -1735 +1735 @@
     rc = onVideoCaptureChange();
     alock.acquire();
-    if (FAILED(rc)) return rc;
+    if (FAILED(rc))
+    {
+        /*
+         * Normally we would do the actual change _after_ onVideoCaptureChange() succeeded.
+         * We cannot do this because that function uses Machine::GetVideoCaptureEnabled to
+         * determine if it should start or stop capturing. Therefore we need to manually
+         * undo change.
+         */
+        mHWData->mVideoCaptureEnabled = mHWData.backedUpData()->mVideoCaptureEnabled;
+        return rc;
+    }
 
     /** Save settings if online - @todo why is this required? -- @bugref{6818} */