Merge pull request #466 from mbm-OR/bugfix/Timetable-mode-crash

cjakeman · web-flow · commit a911f7c29e6c · 2021-09-06T19:16:28.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/1942652. Timetable crash.
diff --git a/Source/RunActivity/Viewer3D/Popups/MultiPlayerWindow.cs b/Source/RunActivity/Viewer3D/Popups/MultiPlayerWindow.cs
@@ -119,7 +119,8 @@ protected internal override void Initialize()
         {
             base.Initialize();
             // Reset window size
-            UpdateWindowSize();
+            if(!Owner.Viewer.Simulator.TimetableMode)
+                UpdateWindowSize();
         }
 
         protected override ControlLayout Layout(ControlLayout layout)
@@ -365,7 +366,7 @@ void AddSeparator() => AddLabel(new ListLabel
                 }
                 AddLabel(new ListLabel());
             }
-            else if(Orts.MultiPlayer.MPManager.Simulator.Confirmer != null)
+            else if (Orts.MultiPlayer.MPManager.Simulator.Confirmer != null)
             {
                 var status = $"{Viewer.Catalog.GetString("Status")}: {MPManager.Catalog.GetString("Connection to the server is lost, will play as single mode")}";
                 AddLabel(new ListLabel

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ protected internal override void Initialize()`
`119`	`119`	`{`
`120`	`120`	`base.Initialize();`
`121`	`121`	`// Reset window size`
`122`		`- UpdateWindowSize();`
	`122`	`+ if(!Owner.Viewer.Simulator.TimetableMode)`
	`123`	`+ UpdateWindowSize();`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`protected override ControlLayout Layout(ControlLayout layout)`
`@@ -365,7 +366,7 @@ void AddSeparator() => AddLabel(new ListLabel`
`365`	`366`	`}`
`366`	`367`	`AddLabel(new ListLabel());`
`367`	`368`	`}`
`368`		`- else if(Orts.MultiPlayer.MPManager.Simulator.Confirmer != null)`
	`369`	`+ else if (Orts.MultiPlayer.MPManager.Simulator.Confirmer != null)`
`369`	`370`	`{`
`370`	`371`	`var status = $"{Viewer.Catalog.GetString("Status")}: {MPManager.Catalog.GetString("Connection to the server is lost, will play as single mode")}";`
`371`	`372`	`AddLabel(new ListLabel`