@@ -239,15 +239,7 @@ def schedule_timeout():
239239 ephemeral = False
240240 raw_barcode = barcode
241241 if triggered_mode :
242- if triggered_mode .prefix_trigger :
243- for pref in triggered_mode .prefix_trigger :
244- if barcode .startswith (pref ):
245- effective_mode = triggered_mode
246- ephemeral = True
247- if triggered_mode .strip_prefix :
248- barcode = barcode [len (pref ):]
249- break
250- if not ephemeral and triggered_mode .trigger and barcode in triggered_mode .trigger :
242+ if triggered_mode .trigger and barcode in triggered_mode .trigger :
251243 with mode_lock :
252244 current_mode = triggered_mode
253245 effective_mode = current_mode
@@ -283,6 +275,14 @@ def schedule_timeout():
283275 log_event ("exception" , mode = effective_mode .name ,
284276 method = effective_mode .method , error = str (e ))
285277 continue
278+ if triggered_mode .prefix_trigger :
279+ for pref in triggered_mode .prefix_trigger :
280+ if barcode .startswith (pref ):
281+ effective_mode = triggered_mode
282+ ephemeral = True
283+ if triggered_mode .strip_prefix :
284+ barcode = barcode [len (pref ):]
285+ break
286286
287287 payload = {"barcode" : barcode ,
288288 "mode" : effective_mode .name , "action" : "scan" }
0 commit comments