Saving and loading fully works

2 files changed, 10 insertions, 6 deletions

diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index 067a874..a3c3704 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -31,7 +31,7 @@ void ManagedAccel::UpdateAccel(
 	double midpoint,
 	double gain_cap)
 {
-	modifier_args args{};
+	modifier_args args = modifier_args{};
 	args.acc_fn_args.accel_mode = mode;
 	args.degrees = rotation;
 	args.sens.x = sensitivityX;
@@ -52,6 +52,7 @@ void ManagedAccel::UpdateAccel(
 	delete temp_modifier;
 
 	ReadFromDriver();
+
 }
 
 double ManagedAccel::SensitivityX::get() { return modifier_instance->sensitivity.x; }
@@ -68,6 +69,8 @@ double ManagedAccel::WeightY::get() { return modifier_instance->accel_fn.impl_ar
 double ManagedAccel::Offset::get() { return modifier_instance->accel_fn.speed_offset; }
 double ManagedAccel::LimitExp::get() { return modifier_instance->accel_fn.impl_args.limit; }
 double ManagedAccel::Midpoint::get() { return modifier_instance->accel_fn.impl_args.midpoint; }
+double ManagedAccel::MinimumTime::get() { return modifier_instance->accel_fn.time_min; }
+double ManagedAccel::PowerScale::get() { return modifier_instance->accel_fn.impl_args.power_scale; }
 
 void ManagedAccel::WriteToDriver()
 {
diff --git a/wrapper/wrapper.hpp b/wrapper/wrapper.hpp
index e90b308..3643eb5 100644
--- a/wrapper/wrapper.hpp
+++ b/wrapper/wrapper.hpp
@@ -7,13 +7,10 @@
 using namespace rawaccel;
 using namespace System;
 
-[ Serializable ]
 public ref class ManagedAccel
 {
 protected:
-    [ NonSerialized ]
 	mouse_modifier* modifier_instance;
-    [ NonSerialized ]
     wrapper_io* driverWriter;
 public:
 	ManagedAccel(mouse_modifier* accel)
@@ -28,6 +25,9 @@ public:
         driverWriter = new wrapper_io();
 	}
 
+    // Empty constructor needed for serialization
+    ManagedAccel() {}
+
     virtual ~ManagedAccel()
     {
         if (modifier_instance!= nullptr)
@@ -49,16 +49,17 @@ public:
     property double Rotation { double get(); }
     property int Type { int get(); }
     property double Acceleration { double get(); }
+    property bool GainCapEnabled { bool get(); }
     property double CapX { double get(); }
     property double CapY { double get(); }
     property double GainCap { double get(); }
-    property bool GainCapEnabled { bool get(); }
     property double WeightX { double get(); }
     property double WeightY { double get(); }
     property double Offset { double get(); }
     property double LimitExp { double get(); }
     property double Midpoint { double get(); }
-
+    property double MinimumTime { double get(); }
+    property double PowerScale { double get(); }
     mouse_modifier* GetInstance()
     {
         return modifier_instance;