Adding upstream version 7.0.20-dfsg.upstream/7.0.20-dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 13 deletions

diff --git a/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/VBox/Main/src-client/ConsoleImpl.cpp
index 6d94eb1f..c28eda2a 100644
--- a/src/VBox/Main/src-client/ConsoleImpl.cpp
+++ b/src/VBox/Main/src-client/ConsoleImpl.cpp
@@ -7500,8 +7500,11 @@ int Console::i_recordingStart(util::AutoWriteLock *pAutoLock /* = NULL */)
 
 /**
  * Stops recording. Does nothing if recording is not active.
+ *
+ * Note: This does *not* disable recording for a VM, in other words,
+ *       it does not change the VM's recording (enabled) setting.
  */
-int Console::i_recordingStop(util::AutoWriteLock *pAutoLock /* = NULL */)
+int Console::i_recordingStop(util::AutoWriteLock *)
 {
     if (!mRecording.mCtx.IsStarted())
         return VINF_SUCCESS;
@@ -7514,18 +7517,6 @@ int Console::i_recordingStop(util::AutoWriteLock *pAutoLock /* = NULL */)
         const size_t cStreams = mRecording.mCtx.GetStreamCount();
         for (unsigned uScreen = 0; uScreen < cStreams; ++uScreen)
             mDisplay->i_recordingScreenChanged(uScreen);
-
-        if (pAutoLock)
-            pAutoLock->release();
-
-        ComPtr<IRecordingSettings> pRecordSettings;
-        HRESULT hrc = mMachine->COMGETTER(RecordingSettings)(pRecordSettings.asOutParam());
-        ComAssertComRC(hrc);
-        hrc = pRecordSettings->COMSETTER(Enabled)(FALSE);
-        ComAssertComRC(hrc);
-
-        if (pAutoLock)
-            pAutoLock->acquire();
     }
 
     LogFlowFuncLeaveRC(vrc);