Fix crash

f46b74d8 · Don Gagne · ff60b3c1 · f46b74d8
Commit f46b74d8 authored Jun 22, 2015 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

UAS.cc src/uas/UAS.cc +5 -3

No files found.
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -243,9 +243,11 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
 UAS::~UAS()
 {
    stopHil();
-    // wait for the simulator to exit
+    if (simulation) {
-    simulation->wait();
+        // wait for the simulator to exit
-    simulation->deleteLater();
+        simulation->wait();
+        simulation->deleteLater();
+    }
    writeSettings();
 }