aboutsummaryrefslogtreecommitdiffstats
path: root/support/magicleap/Servo2D/code/src
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2018-11-02 10:57:26 -0500
committerAlan Jeffrey <ajeffrey@mozilla.com>2018-11-02 10:57:26 -0500
commit57085eea6a396f07904f6e1b68134cb1d4534eb0 (patch)
tree25a0b2e5ca864a293ae5505a45e14e1519e3e331 /support/magicleap/Servo2D/code/src
parent95bfaa0a770479fb3bf6bf0b1f85c9ae343e66ff (diff)
downloadservo-57085eea6a396f07904f6e1b68134cb1d4534eb0.tar.gz
servo-57085eea6a396f07904f6e1b68134cb1d4534eb0.zip
Shut down servo when the ML app quits
Diffstat (limited to 'support/magicleap/Servo2D/code/src')
-rw-r--r--support/magicleap/Servo2D/code/src/Servo2D.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/support/magicleap/Servo2D/code/src/Servo2D.cpp b/support/magicleap/Servo2D/code/src/Servo2D.cpp
index d24316490b6..2c1ba02a038 100644
--- a/support/magicleap/Servo2D/code/src/Servo2D.cpp
+++ b/support/magicleap/Servo2D/code/src/Servo2D.cpp
@@ -58,8 +58,6 @@ Servo2D::Servo2D() {
// Destroy a Servo 2D instance
Servo2D::~Servo2D() {
ML_LOG(Debug, "Servo2D Destructor.");
- discard_servo(servo_);
- servo_ = nullptr;
}
// The prism dimensions
@@ -167,6 +165,8 @@ int Servo2D::init() {
int Servo2D::deInit() {
ML_LOG(Debug, "Servo2D Deinitializing.");
+ discard_servo(servo_);
+ servo_ = nullptr;
return 0;
}