Fix-Crash-Player-Train-changed-by-TrainList

mbm-OR · mbm-OR · commit 3ca0eb19f513 · 2024-03-16T23:48:48.000+01:00
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
@@ -322,8 +322,10 @@ void AddSpace()
                         line.AddSpace(textHeight / 2, line.RemainingHeight);
                     }
 
-                    if (LabelPositionTop.Count == 0)
+                    // Avoids crash when the PlayerTrain was changed from the Train List window
+                    if (LabelPositionTop.Count == 0 || PlayerTrain.Cars.Count != LabelPositionTop.Count)
                     {
+                        LabelPositionTop.Clear();
                         var n = scrollbox.Position.Y;// first row
                         for (var i = 0; i < PlayerTrain.Cars.Count; i++)
                         {   // Position of each row

Original file line number	Diff line number	Diff line change
`@@ -322,8 +322,10 @@ void AddSpace()`
`322`	`322`	`line.AddSpace(textHeight / 2, line.RemainingHeight);`
`323`	`323`	`}`
`324`	`324`
`325`		`- if (LabelPositionTop.Count == 0)`
	`325`	`+ // Avoids crash when the PlayerTrain was changed from the Train List window`
	`326`	`+ if (LabelPositionTop.Count == 0 \|\| PlayerTrain.Cars.Count != LabelPositionTop.Count)`
`326`	`327`	`{`
	`328`	`+ LabelPositionTop.Clear();`
`327`	`329`	`var n = scrollbox.Position.Y;// first row`
`328`	`330`	`for (var i = 0; i < PlayerTrain.Cars.Count; i++)`
`329`	`331`	`{ // Position of each row`