From 4404fc797a432c29ae08640706039692cf4dc09d Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 23 Aug 2022 14:36:48 +0100 Subject: [PATCH] don't allow setting a static on TS2 if it's already set on TS1 --- bridge_master.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 7051ed8..d6ac15f 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -946,8 +946,8 @@ def options_config(): if CONFIG['SYSTEMS'][_system]['TS2_STATIC']: ts2 = CONFIG['SYSTEMS'][_system]['TS2_STATIC'].split(',') for tg in ts2: - if not tg or int(tg) == 0 or int(tg) >= 16777215 or tg == _options['DEFAULT_REFLECTOR']: - logger.debug('(OPTIONS) %s not setting TS2 Static %s. Bad TG or conflict DIAL',_system,tg) + if not tg or int(tg) == 0 or int(tg) >= 16777215 or tg == _options['DEFAULT_REFLECTOR'] or tg in ts1: + logger.debug('(OPTIONS) %s not setting TS2 Static %s. Bad TG or conflict with DIAL or TS1',_system,tg) continue tg = int(tg) reset_static_tg(tg,2,_tmout,_system)