diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-29 12:11:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-29 12:11:35 +0200 |
| commit | dcef13a23c06398c0c9b3145c08b28d1110bc169 (patch) | |
| tree | df8d3227b3d71fdd356b3c1e69c62533d1759f72 /app/bin/track.c | |
| parent | 3e11d9c0e6173fce8a482efed8d7f965e8bd6dfa (diff) | |
| parent | 16e9630b79f0a7a90c6cedb6781175bb8b337dc1 (diff) | |
Merge tag 'upstream/4.3.0'
Upstream version 4.3.0
Diffstat (limited to 'app/bin/track.c')
| -rw-r--r-- | app/bin/track.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/bin/track.c b/app/bin/track.c index 30ea186..bbbf48a 100644 --- a/app/bin/track.c +++ b/app/bin/track.c @@ -923,7 +923,7 @@ EXPORT void ResolveIndex( void ) { track_p trk; EPINX_T ep; - TRK_ITERATE(trk) + TRK_ITERATE(trk) { for (ep=0; ep<trk->endCnt; ep++) if (trk->endPt[ep].index >= 0) { trk->endPt[ep].track = FindTrack( trk->endPt[ep].index ); @@ -931,6 +931,9 @@ EXPORT void ResolveIndex( void ) NoticeMessage( MSG_RESOLV_INDEX_BAD_TRK, _("Continue"), NULL, trk->index, ep, trk->endPt[ep].index ); } } + ResolveBlockTrack (trk); + ResolveSwitchmotorTurnout (trk); + } AuditTracks( "readTracks" ); } @@ -966,6 +969,8 @@ LOG( log_track, 4, ( "DeleteTrack(T%d)\n", GetTrkIndex(trk) ) ) ClrTrkElev( trk2 ); } } + CheckDeleteSwitchmotor( trk ); + CheckDeleteBlock( trk ); UndoDelete( trk ); MainRedraw(); trackCount--; |