Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1

Change-Id: If65f60670bbfb011363a1b5230253805b3e63553

1 files changed, 2 insertions, 5 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index cfac61c01..823cfe408 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();