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

Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0

1 files changed, 3 insertions, 2 deletions

diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
index 383af812a..c053c8e38 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
@@ -269,7 +269,7 @@ void QAndroidCaptureSession::stop(bool error)
     delete m_mediaRecorder;
     m_mediaRecorder = 0;
 
-    if (m_cameraSession) {
+    if (m_cameraSession && m_cameraSession->status() == QCamera::ActiveStatus) {
         // Viewport needs to be restarted after recording
         restartViewfinder();
     }
@@ -278,7 +278,7 @@ void QAndroidCaptureSession::stop(bool error)
         // if the media is saved into the standard media location, register it
         // with the Android media scanner so it appears immediately in apps
         // such as the gallery.
-        QString mediaPath = m_actualOutputLocation.toLocalFile();
+        QString mediaPath = m_usedOutputLocation.toLocalFile();
         QString standardLoc = m_cameraSession ? AndroidMultimediaUtils::getDefaultMediaDirectory(AndroidMultimediaUtils::DCIM)
                                               : AndroidMultimediaUtils::getDefaultMediaDirectory(AndroidMultimediaUtils::Sounds);
         if (mediaPath.startsWith(standardLoc))
@@ -516,6 +516,7 @@ void QAndroidCaptureSession::updateStatus()
         if (m_cameraSession->status() == QCamera::StoppingStatus
                 || !m_cameraSession->captureMode().testFlag(QCamera::CaptureVideo)) {
             setState(QMediaRecorder::StoppedState);
+            return;
         }
 
         if (m_state == QMediaRecorder::RecordingState) {