Control for gesture triggers

edr/edrclient.py

@@ -3231,9 +3231,9 @@ def station_in_current_system(self, station_name, passive=False):
         return True
 
     def pointing_guidance(self, entry):
-        if (not self._gesture_triggers):
+        if (not self.gesture_triggers):
             EDR_LOG.log("Gestures setting is off, skipping processing", "INFO")
-            return
+            return True
         # TODO add the name of the thing in the header
         target = self.player.remlok_helmet.pointing_at(entry)
         if not target:
@@ -3252,7 +3252,7 @@ def pointing_guidance(self, entry):
         return True
 
     def gesture(self, entry):
-        if (not self._gesture_triggers):
+        if (not self.gesture_triggers):
             EDR_LOG.log("Gestures setting is off, skipping processing", "INFO")
             return
         default_emote_regex = r"^\$HumanoidEmote_DefaultMessage:#player=\$cmdr_decorate:#name=(.+);:#action=\$HumanoidEmote_(.+)_Action[;]+$"

edr/load.py

@@ -1293,7 +1293,7 @@ def report_comms(player, entry):
                 EDR_LOG.log(u"Emote to {} (not friend/wing) == same location".format(receiving_party), "INFO")
                 contact = player.instanced_player(receiving_party)
                 edr_submit_contact(contact, entry["timestamp"], "Emote sent (non wing/friend player)", player)
-                if action in ["wave", "point"]:
+                if action in ["wave", "point"] and EDR_CLIENT.gesture_triggers:
                     EDR_LOG.log(u"Implicit who emote-command for {}".format(receiving_party), "INFO")
                     EDR_CLIENT.who(receiving_party, autocreate=True)
             elif "$HumanoidEmote_TargetMessage:#player=$cmdr_decorate:#name=" in entry.get("Message", ""):