diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-07-10 16:56:23 +0200 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@digia.com> | 2014-07-14 01:59:35 +0200 |
| commit | a7d10a265aea417ed80f9cf90545b4c3b6cd8866 (patch) | |
| tree | ffac173e3b03eb8d5702c6586b5011c12d188aed /src/plugins/android/src/mediacapture | |
| parent | 389d66b3ed5e2d798e9fb124064523239c393ad8 (diff) | |
Android: Make sure we check and clear exceptions from the camera.
In several places we where ignoring the fact that we might get an
exception from the camera code on Android. Failing to clear them will
cause the application to to terminate.
Task-number: QTBUG-39425
Change-Id: Idfe40e1749f54d551d37dae25912d9ddbc3da01e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/android/src/mediacapture')
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcamerasession.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp index 963952294..90d223c34 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcamerasession.cpp @@ -331,11 +331,12 @@ bool QAndroidCameraSession::startPreview() if (m_previewStarted) return true; - if (m_videoOutput->isReady()) - m_camera->setPreviewTexture(m_videoOutput->surfaceTexture()); - else + if (!m_videoOutput->isReady()) return true; // delay starting until the video output is ready + if (!m_camera->setPreviewTexture(m_videoOutput->surfaceTexture())) + return false; + m_status = QCamera::StartingStatus; emit statusChanged(m_status); |