summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-08-20 04:17:59 +0200
committerRobin Gareus <robin@gareus.org>2019-08-20 04:18:43 +0200
commit6227dd5b04e394ea2afda3ed7916b40c28706d2f (patch)
tree7a21b26bc5e13a316b9f96d8d380640ca2493f99 /libs
parentf5330d763aab011f2dd2893848992e3b7381a8ac (diff)
Shuttle Surface: Fix uninitialized argument in case of incomplete state
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaces/contourdesign/contourdesign.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/libs/surfaces/contourdesign/contourdesign.cc b/libs/surfaces/contourdesign/contourdesign.cc
index a5e9e24c43..db191be501 100644
--- a/libs/surfaces/contourdesign/contourdesign.cc
+++ b/libs/surfaces/contourdesign/contourdesign.cc
@@ -194,10 +194,15 @@ ContourDesignControlProtocol::set_state (const XMLNode& node, int version)
_button_actions[i] = b;
} else {
double value;
- child->get_property(X_("value"), value);
-
string s;
- child->get_property(X_("unit"), s);
+
+ if (!child->get_property(X_("value"), value)) {
+ continue;
+ }
+ if (!child->get_property(X_("unit"), s)) {
+ continue;
+ }
+
JumpUnit unit;
if (s == X_("seconds")) {
unit = SECONDS;