projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
emit deviceChanged() after we are done recreating DeviceSettings
[harmattan/cameraplus]
/
src
/
settings.cpp
diff --git
a/src/settings.cpp
b/src/settings.cpp
index
7cafca0
..
9bed54b
100644
(file)
--- a/
src/settings.cpp
+++ b/
src/settings.cpp
@@
-175,7
+175,6
@@
void Settings::setDevice(int device) {
m_settings->setValue("camera/device", device);
delete m_device; m_device = 0;
- emit deviceChanged();
if (mode() == DEFAULT_MODE) {
// image
@@
-198,6
+197,8
@@
void Settings::setDevice(int device) {
emit videoResolutionChanged();
emit videoTorchOnChanged();
}
+
+ emit deviceChanged();
}
}