summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVaL Doroshchuk <valentyn.doroshchuk@qt.io>2018-02-05 12:21:40 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-02-05 13:00:52 +0000
commit038716bb1f2d9b95f2d638e2d61d297563343af9 (patch)
tree5389cad31661a5b3fb232c8cf407f634013a6357
parent63f182ff7773d9b99243f7eda2496abcc12cb694 (diff)
Revert "GStreamer: Prevent calling CameraBinSession::setStateHelper twice"v5.10.1
This reverts commit 9caee039533168fbb546b563859770414e54fc94. Reverted due to GST_STATE_PLAYING is never set. Task-number: QTBUG-66196 Change-Id: I85cf47c747b1e153265f2eee6477124f4683a574 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinsession.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index cfac61c0..823cfe40 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -732,21 +732,18 @@ void CameraBinSession::setState(QCamera::State newState)
if (newState == m_pendingState)
return;
- emit pendingStateChanged(newState);
+ m_pendingState = newState;
+ emit pendingStateChanged(m_pendingState);
#if CAMERABIN_DEBUG
qDebug() << Q_FUNC_INFO << newState;
#endif
setStateHelper(newState);
- m_pendingState = newState;
}
void CameraBinSession::setStateHelper(QCamera::State state)
{
- if (state == m_pendingState)
- return;
-
switch (state) {
case QCamera::UnloadedState:
unload();