Ochrana proti JC na okruhu.

kmzbrnoI · Jul 25, 2018 · b4333dd · b4333dd
1 parent 144cefb
commit b4333dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/bloky/TBloky.pas b/src/bloky/TBloky.pas
@@ -845,14 +845,15 @@ function TBlky.GetBlkWithSpr(spr:Integer):TBlksList;
 // predpovidani soupravy na bloky v jizdni ceste
 
 procedure TBlky.SprPrediction(Nav:TBlk);
-var Usek:TBlk;
+var Usek, startUsek:TBlk;
     Trat:TBlk;
     spr:Integer;
     JC:TJC;
 begin
  try
    // zjistime soupravu pred navestidlem
    Usek := (Nav as TBlkSCom).UsekPred;
+   startUsek := Usek;
    spr := (Nav as TBlkSCom).GetSoupravaIndex(usek);
 
    if ((Nav as TBlkSCom).Navest > 0) then begin
@@ -870,6 +871,9 @@ procedure TBlky.SprPrediction(Nav:TBlk);
      // zjistime posledni usek jizdni cesty
      Blky.GetBlkByID(JC.data.Useky[JC.data.Useky.Count-1], Usek);
 
+     if (usek = startUsek) then
+       break; // ochrana proti JC na ovalu
+
      if ((Usek.typ = _BLK_TU) and ((Usek as TBlkTU).InTrat > -1)) then
       begin
        // pokud je usek v trati, zmenime usek na usek na druhem konci trati

diff --git a/src/hJOPserver.dproj b/src/hJOPserver.dproj
@@ -294,7 +294,7 @@
 						<VersionInfo Name="AutoIncBuild">True</VersionInfo>
 						<VersionInfo Name="MajorVer">4</VersionInfo>
 						<VersionInfo Name="MinorVer">13</VersionInfo>
-						<VersionInfo Name="Release">0</VersionInfo>
+						<VersionInfo Name="Release">1</VersionInfo>
 						<VersionInfo Name="Build">0</VersionInfo>
 						<VersionInfo Name="Debug">False</VersionInfo>
 						<VersionInfo Name="PreRelease">False</VersionInfo>
@@ -307,7 +307,7 @@
 					<VersionInfoKeys>
 						<VersionInfoKeys Name="CompanyName">Jan Horáček</VersionInfoKeys>
 						<VersionInfoKeys Name="FileDescription">hJOP technologicky server</VersionInfoKeys>
-						<VersionInfoKeys Name="FileVersion">4.13.0.0</VersionInfoKeys>
+						<VersionInfoKeys Name="FileVersion">4.13.1.0</VersionInfoKeys>
 						<VersionInfoKeys Name="InternalName">hJOPserver</VersionInfoKeys>
 						<VersionInfoKeys Name="LegalCopyright">Jan Horáček 2008-2018</VersionInfoKeys>
 						<VersionInfoKeys Name="LegalTrademarks"/>