slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 5.6 into 5.6.1

Browse Source 
Change-Id: Ib4a7640e12319d78ea5ae8f58d79c9fab8d0ea60
This commit is contained in:
Oswald Buddenhagen
2016-05-12 11:18:04 +02:00
parent c84bdf63e4 15951e672e
commit 690064468c
7 changed files with 68 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/winrt/qwinrtcameracontrol.cpp
View File

@@ -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;