projects
/
harmattan
/
cameraplus
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4861515
)
Stop autofocus if we fail to capture the image
author
Mohammed Sameer
<msameer@foolab.org>
Mon, 5 Aug 2013 00:44:11 +0000
(
03:44
+0300)
committer
Mohammed Sameer
<msameer@foolab.org>
Mon, 5 Aug 2013 00:44:11 +0000
(
03:44
+0300)
qml/ImageOverlay.qml
patch
|
blob
|
history
diff --git
a/qml/ImageOverlay.qml
b/qml/ImageOverlay.qml
index
c9416f3
..
c14791e
100644
(file)
--- a/
qml/ImageOverlay.qml
+++ b/
qml/ImageOverlay.qml
@@
-241,14
+241,19
@@
Item {
function captureImage() {
if (!imageMode.canCapture) {
showError(qsTr("Camera is already capturing an image."))
function captureImage() {
if (!imageMode.canCapture) {
showError(qsTr("Camera is already capturing an image."))
+ cam.autoFocus.stopAutoFocus()
} else if (!checkBattery()) {
showError(qsTr("Not enough battery to capture images."))
} else if (!checkBattery()) {
showError(qsTr("Not enough battery to capture images."))
+ cam.autoFocus.stopAutoFocus()
} else if (!fileSystem.available) {
showError(qsTr("Camera cannot capture images in mass storage mode."))
} else if (!fileSystem.available) {
showError(qsTr("Camera cannot capture images in mass storage mode."))
+ cam.autoFocus.stopAutoFocus()
} else if (!checkDiskSpace()) {
showError(qsTr("Not enough space to capture images."))
} else if (!checkDiskSpace()) {
showError(qsTr("Not enough space to capture images."))
+ cam.autoFocus.stopAutoFocus()
} else if (!mountProtector.lock()) {
showError(qsTr("Failed to lock images directory."))
} else if (!mountProtector.lock()) {
showError(qsTr("Failed to lock images directory."))
+ cam.autoFocus.stopAutoFocus()
} else {
metaData.setMetaData()
} else {
metaData.setMetaData()
@@
-256,6
+261,7
@@
Item {
if (!imageMode.capture(fileName)) {
showError(qsTr("Failed to capture image. Please restart the camera."))
mountProtector.unlock()
if (!imageMode.capture(fileName)) {
showError(qsTr("Failed to capture image. Please restart the camera."))
mountProtector.unlock()
+ cam.autoFocus.stopAutoFocus()
} else {
trackerStore.storeImage(fileName)
}
} else {
trackerStore.storeImage(fileName)
}