spline: fix deadlock, logic error

Tracking rarely deadlocked when saving mappings.

Investigating it further also shown how a wrong bundle was used for
Accela's splines.

1 files changed, 3 insertions, 3 deletions

diff --git a/spline/axis-opts.cpp b/spline/axis-opts.cpp
index fa527877..489008e6 100644
--- a/spline/axis-opts.cpp
+++ b/spline/axis-opts.cpp
@@ -27,14 +27,14 @@ static max_clamp get_max_y(Axis k)
 }
 
 axis_opts::axis_opts(QString pfx, Axis idx) :
+    prefix_(pfx),
+    axis_(idx),
     zero(b_settings_window, n(pfx, "zero-pos"), 0),
     src(b_settings_window, n(pfx, "source-index"), idx),
     invert(b_settings_window, n(pfx, "invert-sign"), false),
     altp(b_mapping_window, n(pfx, "alt-axis-sign"), false),
     clamp_x_(b_mapping_window, n(pfx, "max-value"), get_max_x(idx)),
-    clamp_y_(b_mapping_window, n(pfx, "max-output-value"), get_max_y(idx)),
-    prefix_(pfx),
-    axis_(idx)
+    clamp_y_(b_mapping_window, n(pfx, "max-output-value"), get_max_y(idx))
 {}
 
 QString const& axis_opts::prefix() const { return prefix_; }