summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Srebrny <piotr.srebrny@qt.io>2022-08-24 14:31:24 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-25 11:14:19 +0000
commitcce98a3be75501292b7fa5705324499d6e8dd83f (patch)
tree4a96af9448642c8a94a1b780c9379e838626f816
parent65e4b74bca1ec4d17105abdadd0499934df2d137 (diff)
Do not deactivate session based on outdated information
The m_sessionWasActive value is set when recording starts; thus, we can use it only after recording has started. This is m_state != StoppedState. Change-Id: Ib855fa694478bbd093633e18035294284518eec1 Reviewed-by: André de la Rocha <andre.rocha@qt.io> (cherry picked from commit 85177882cc3e0f4b8968df0aaa20925ad64172df) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
index 83ab48151..bde9a3aa7 100644
--- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
+++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
@@ -104,10 +104,11 @@ void QWindowsMediaEncoder::resume()
void QWindowsMediaEncoder::stop()
{
- if (m_mediaDeviceSession && m_state != QMediaRecorder::StoppedState)
+ if (m_mediaDeviceSession && m_state != QMediaRecorder::StoppedState) {
m_mediaDeviceSession->stopRecording();
- if (!m_sessionWasActive)
- m_mediaDeviceSession->setActive(false);
+ if (!m_sessionWasActive)
+ m_mediaDeviceSession->setActive(false);
+ }
}