Fix improved

mbm-OR · mbm-OR · commit 04d1bb7ca046 · 2022-01-04T21:04:05.000+01:00
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs
@@ -812,8 +812,12 @@ void AddSeparator() => AddLabel(new ListLabel
 
                 if (trainBrakeStatus.Contains(Viewer.Catalog.GetString("EOT")))
                 {
-                    int indexOffset = Viewer.Catalog.GetString("EOT").Length + 1;
-                    index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("BC"));
+                    int indexOffset = Viewer.Catalog.GetString("EOT").Length + 1; 
+                    if (trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("V"), index) > 0)
+                        index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("V"), index);
+                    else
+                        index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("BC"));
+
                     brakeInfoValue = trainBrakeStatus.Substring(index, trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("EOT")) - index).TrimEnd();
                     AddLabel(new ListLabel
                     {

Original file line number	Diff line number	Diff line change
`@@ -812,8 +812,12 @@ void AddSeparator() => AddLabel(new ListLabel`
`812`	`812`
`813`	`813`	`if (trainBrakeStatus.Contains(Viewer.Catalog.GetString("EOT")))`
`814`	`814`	`{`
`815`		`- int indexOffset = Viewer.Catalog.GetString("EOT").Length + 1;`
`816`		`- index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("BC"));`
	`815`	`+ int indexOffset = Viewer.Catalog.GetString("EOT").Length + 1;`
	`816`	`+ if (trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("V"), index) > 0)`
	`817`	`+ index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("V"), index);`
	`818`	`+ else`
	`819`	`+ index = trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("BC"));`
	`820`	`+`
`817`	`821`	`brakeInfoValue = trainBrakeStatus.Substring(index, trainBrakeStatus.IndexOf(Viewer.Catalog.GetString("EOT")) - index).TrimEnd();`
`818`	`822`	`AddLabel(new ListLabel`
`819`	`823`	`{`