From 69aa300fedd3762bf226d17f5a73877261fa7736 Mon Sep 17 00:00:00 2001
From: walker-sheng <walkersxq@163.com>
Date: Wed, 15 Sep 2021 17:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E9=94=81=E7=B3=BB=E7=BB=9F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java | 2 +-
 .../java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java
index 03591a5bb..eb88a7834 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiLogic.java
@@ -85,7 +85,7 @@ public class CiLogic {
             }
         }
         // 进路延续保护办理判断
-        if (route.isSettingOverlap()) {
+        if ((route.isSetting() || route.isLock() || route.isNormalUnlock()) && route.isSettingOverlap()) {
             this.ciService.checkAndTrySettingOverlap(simulation, route.getOverlap());
         }
     }
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java
index 0559aa846..eeefd6584 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java
@@ -227,6 +227,7 @@ public class Signal extends DelayUnlockDevice {
     @Override
     public void reset() {
         super.reset();
+        this.changeToCbtcMode();
         this.lockedRoute = null;
         this.level = LEVEL_Close;
         this.blockade = false;