diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:01:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:01:23 +0200 |
| commit | a7a9e9aa419252e57dc421e6af5781661d7b1af8 (patch) | |
| tree | 037a707167fbb2717093d79a18fe3b59334996c9 /src/plugins/avfoundation/camera | |
| parent | 293566a1841151cf0a374af7016a396c943ab96e (diff) | |
| parent | 8933a59719a5f0c33d47f202d220a566765ec6d4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ib819180a25ceedfb072362d55d30f94e40a44f9b
Diffstat (limited to 'src/plugins/avfoundation/camera')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediarecordercontrol.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm b/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm index 9a6057e6b..f8f4500c1 100644 --- a/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm +++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol.mm @@ -294,6 +294,8 @@ void AVFMediaRecorderControl::setState(QMediaRecorder::State state) m_recordingFinished = false; Q_EMIT actualLocationChanged(actualLocation); + updateStatus(); + Q_EMIT stateChanged(m_state); } else { Q_EMIT error(QMediaRecorder::FormatError, tr("Recorder not configured")); } @@ -312,10 +314,6 @@ void AVFMediaRecorderControl::setState(QMediaRecorder::State state) unapplySettings(); } } - - updateStatus(); - if (state != m_state) - Q_EMIT stateChanged(m_state); } void AVFMediaRecorderControl::setMuted(bool muted) |