summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer
diff options
context:
space:
mode:
authorMohammed Hassan <mohammed.hassan@jolla.com>2015-09-24 17:59:29 +0300
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-04-15 08:08:16 +0000
commitb1a0bc9d454793d705a4aba84b301d3f8dfb50ea (patch)
tree7cabfcf78c4bc04c61e3ec8abafe2d890ebd97ee /src/plugins/gstreamer
parent2755dcf670f8b40ec2f3ecce356b378db08da872 (diff)
Prevent immediate-stop of currently-unloading gst recording pipeline
Don't blindly stop the recording pipeline if it is unloading. Ensure that we check to see if the pipeline is busy, even if it is in Unloaded state. Task-number: QTBUG-65398 Change-Id: Ieac72967311bdd3bafae60bc1d0da9d227a6c237 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/plugins/gstreamer')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabincontrol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
index a34315b8a..fdf3ff4ac 100644
--- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp
@@ -121,7 +121,7 @@ void CameraBinControl::setState(QCamera::State state)
//special case for stopping the camera while it's busy,
//it should be delayed until the camera is idle
- if (state == QCamera::LoadedState &&
+ if ((state == QCamera::LoadedState || state == QCamera::UnloadedState) &&
m_session->status() == QCamera::ActiveStatus &&
m_session->isBusy()) {
#ifdef CAMEABIN_DEBUG