projects
/
harmattan
/
cameraplus
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
c54bd13
)
Don't try to change the resolution while we are changing the device.
author
Mohammed Sameer
<msameer@foolab.org>
Sat, 17 Aug 2013 21:10:58 +0000
(
00:10
+0300)
committer
Mohammed Sameer
<msameer@foolab.org>
Sat, 17 Aug 2013 21:10:58 +0000
(
00:10
+0300)
This will lead to invalid resolution being set. resetCamera() will
take care of setting the resolution after we are done changing the device
qml/MainPage.qml
patch
|
blob
|
history
diff --git
a/qml/MainPage.qml
b/qml/MainPage.qml
index
c4f5de4
..
d45fac0
100644
(file)
--- a/
qml/MainPage.qml
+++ b/
qml/MainPage.qml
@@
-99,15
+99,21
@@
CameraPage {
}
onImageAspectRatioChanged: {
- imageSettings.setImageResolution()
+ if (!root.deviceChangeInProgress) {
+ imageSettings.setImageResolution()
+ }
}
onImageResolutionChanged: {
- imageSettings.setImageResolution()
+ if (!root.deviceChangeInProgress) {
+ imageSettings.setImageResolution()
+ }
}
onVideoResolutionChanged: {
- videoSettings.setVideoResolution()
+ if (!root.deviceChangeInProgress) {
+ videoSettings.setVideoResolution()
+ }
}
}