diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:18:04 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:18:04 +0200 |
| commit | 690064468c647c9ae3f99c7d90e470db6ef7e6c2 (patch) | |
| tree | bb786eaa1ebec2a63e5160abeced7ffa28a22132 /src/plugins/winrt/qwinrtcameracontrol.cpp | |
| parent | c84bdf63e4de16586eda3c45d5c3c3b2dc4fe089 (diff) | |
| parent | 15951e672eaf38537c82043b0b9b14088facbd19 (diff) | |
Merge 5.6 into 5.6.1
Change-Id: Ib4a7640e12319d78ea5ae8f58d79c9fab8d0ea60
Diffstat (limited to 'src/plugins/winrt/qwinrtcameracontrol.cpp')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameracontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp index e2d5fa67d..5c41987a0 100644 --- a/src/plugins/winrt/qwinrtcameracontrol.cpp +++ b/src/plugins/winrt/qwinrtcameracontrol.cpp @@ -632,7 +632,7 @@ void QWinRTCameraControl::setState(QCamera::State state) } QCameraFocus::FocusModes focusMode = d->cameraFocusControl->focusMode(); - if (setFocus(focusMode) && focusMode == QCameraFocus::ContinuousFocus) + if (focusMode != 0 && setFocus(focusMode) && focusMode == QCameraFocus::ContinuousFocus) focus(); d->state = QCamera::ActiveState; |