Merge lp:~michael-sheldon/qtubuntu-camera/fix-1368436 into lp:qtubuntu-camera

Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 114
Merged at revision: 116
Proposed branch: lp:~michael-sheldon/qtubuntu-camera/fix-1368436
Merge into: lp:qtubuntu-camera
Diff against target: 12 lines (+2/-1)
1 file modified
src/aalcameraexposurecontrol.cpp (+2/-1)
To merge this branch: bzr merge lp:~michael-sheldon/qtubuntu-camera/fix-1368436
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+235673@code.launchpad.net

Commit message

Ensure androidControl is valid before using it to change exposure settings.

Description of the change

Ensure androidControl is valid before using it to change exposure settings.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested, works

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/aalcameraexposurecontrol.cpp'
2--- src/aalcameraexposurecontrol.cpp 2014-07-10 14:59:10 +0000
3+++ src/aalcameraexposurecontrol.cpp 2014-09-23 16:38:52 +0000
4@@ -65,7 +65,8 @@
5 return false;
6 }
7
8- if (parameter == QCameraExposureControl::ExposureMode) {
9+ if ((parameter == QCameraExposureControl::ExposureMode) &&
10+ (m_service->androidControl() != NULL)) {
11 m_requestedExposureMode = value.value<QCameraExposure::ExposureMode>();
12 Q_EMIT requestedValueChanged(QCameraExposureControl::ExposureMode);
13

Subscribers

People subscribed via source and target branches