add return validated value (#35)

OpenVoiceOS · Jan 17, 2023 · 75c712c · 75c712c
1 parent 175e1ed
commit 75c712c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py
@@ -426,14 +426,16 @@ def _real_wait_response(self, is_cancel, validator, on_fail, num_retries):
                     self._response = None
                     return
             else:
-                if validator(response):
-                    self._response = response
-                    return
-
                 # catch user saying 'cancel'
                 if is_cancel(response):
                     self._response = None
                     return
+                validated = validator(response)
+                # returns the validated value or the response
+                # (backwards compat)
+                if validated is not False and validated is not None:
+                    self._response = response if validated is True else validated
+                    return                
 
             num_fails += 1
             if 0 < num_retries < num_fails or self._response is not False: