Merge pull request #1061 from mbm-OR/bugfix/Fix-F9-Webpage-conflict

mbm-OR · web-flow · commit 383755b0b3e5 · 2025-03-17T19:49:19.000+01:00
Fix F9 Web-page conflict.
diff --git a/Source/RunActivity/Viewer3D/Cameras.cs b/Source/RunActivity/Viewer3D/Cameras.cs
@@ -1083,6 +1083,9 @@ protected override void OnActivate(bool sameCamera)
                 isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
             }
 
+            // Update the camera view
+            oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
+
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)
             {
                 if (Front)
diff --git a/Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs b/Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs
@@ -282,8 +282,8 @@ private void fillStatus(OperationsStatus operationStatus)
             // Makes this Webpage version, more autonoumus
             if (!Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible && Viewer.IsFormationReversed)
             {
-                _ = new FormationReversed(Viewer, Viewer.PlayerTrain);
                 Viewer.IsFormationReversed = false;
+                _ = new FormationReversed(Viewer, Viewer.PlayerTrain);
             }
 
             int carPosition = 0;

Original file line number	Diff line number	Diff line change
`@@ -1083,6 +1083,9 @@ protected override void OnActivate(bool sameCamera)`
`1083`	`1083`	`isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) \|\| Viewer.TrainCarOperationsViewerWindow.Visible \|\| (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);`
`1084`	`1084`	`}`
`1085`	`1085`
	`1086`	`+ // Update the camera view`
	`1087`	`+ oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;`
	`1088`	`+`
`1086`	`1089`	`if (attachedCar == null \|\| attachedCar.Train != Viewer.SelectedTrain \|\| carPosition != oldCarPosition)`
`1087`	`1090`	`{`
`1088`	`1091`	`if (Front)`
Original file line number	Diff line number	Diff line change
`@@ -282,8 +282,8 @@ private void fillStatus(OperationsStatus operationStatus)`
`282`	`282`	`// Makes this Webpage version, more autonoumus`
`283`	`283`	`if (!Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible && Viewer.IsFormationReversed)`
`284`	`284`	`{`
`285`		`- _ = new FormationReversed(Viewer, Viewer.PlayerTrain);`
`286`	`285`	`Viewer.IsFormationReversed = false;`
	`286`	`+ _ = new FormationReversed(Viewer, Viewer.PlayerTrain);`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`int carPosition = 0;`