New upstream version 4.3.0upstream/4.3.0

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--;