Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	.qmake.conf

Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111

1 files changed, 9 insertions, 3 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index 4941c6ef6..cfac61c01 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -466,6 +466,9 @@ GstElement *CameraBinSession::buildCameraSource()
 #if CAMERABIN_DEBUG
     qDebug() << Q_FUNC_INFO;
 #endif
+    if (m_inputDevice.isEmpty())
+        return nullptr;
+
     if (!m_inputDeviceHasChanged)
         return m_cameraSrc;
 
@@ -482,7 +485,7 @@ GstElement *CameraBinSession::buildCameraSource()
     if (!m_cameraSrc)
         m_cameraSrc = camSrc;
 
-    if (m_cameraSrc && !m_inputDevice.isEmpty()) {
+    if (m_cameraSrc) {
 #if CAMERABIN_DEBUG
         qDebug() << "set camera device" << m_inputDevice;
 #endif
@@ -729,18 +732,21 @@ void CameraBinSession::setState(QCamera::State newState)
     if (newState == m_pendingState)
         return;
 
-    m_pendingState = newState;
-    emit pendingStateChanged(m_pendingState);
+    emit pendingStateChanged(newState);
 
 #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();