From c7d0f834d015c4ae7ec0daa55ab178332b75cb52 Mon Sep 17 00:00:00 2001
From: Sidi Liang <1467329765@qq.com>
Date: Sat, 4 Apr 2020 15:07:39 +0800
Subject: [PATCH] Airbag: bug fix

---
 Nasal/systems.nas             |  7 ++++---
 gui/dialogs/config-dialog.xml | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Nasal/systems.nas b/Nasal/systems.nas
index 1ecdd19..7bababe 100644
--- a/Nasal/systems.nas
+++ b/Nasal/systems.nas
@@ -486,20 +486,21 @@ var Safety = {
         if(math.abs(me.accXProp.getValue() * FT2M) > me.airbagAccelerationLimit){
             #active Front
             me.frontAirbagProp.setValue(1);
-            me.safetySystemTimer.stop();
         }
         #side airbag
         if(math.abs(me.accYProp.getValue() * FT2M) > me.airbagAccelerationLimit){
             #active side
             me.sideAirbagProp.setValue(1);
-            me.safetySystemTimer.stop();
         }
     },
     reset: func(){
+        #resetting stops the system
+        me.safetySystemTimer.stop();
         me.frontAirbagProp.setValue(0);
-        me.frontAirbagProp.setValue(0);
+        me.sideAirbagProp.setValue(0);
     },
     init: func(){
+        #initialize or reinitialize
         me.frontAirbagProp.setValue(0);
         me.sideAirbagProp.setValue(0);
         if(me.safetySystemTimer == nil) me.safetySystemTimer = maketimer(me.updateInterval, func me.update());
diff --git a/gui/dialogs/config-dialog.xml b/gui/dialogs/config-dialog.xml
index a26a8f4..894cbca 100755
--- a/gui/dialogs/config-dialog.xml
+++ b/gui/dialogs/config-dialog.xml
@@ -135,12 +135,22 @@
             </button>
             <button>
                 <halign>left</halign>
-                <legend>Toggle Airbag</legend>
+                <legend>Enable/Repair Airbag</legend>
                 <pref-width>120</pref-width>
                 <pref-height>28</pref-height>
                 <binding>
                     <command>nasal</command>
-                    <script>followme.safety.toggle()</script>
+                    <script>followme.safety.init()</script>
+                </binding>
+            </button>
+            <button>
+                <halign>left</halign>
+                <legend>Disable Airbag</legend>
+                <pref-width>120</pref-width>
+                <pref-height>28</pref-height>
+                <binding>
+                    <command>nasal</command>
+                    <script>followme.safety.stop()</script>
                 </binding>
             </button>
         </group>