When starting the Map (Game Multi Player Dispatcher) focus goes back to main window. Starting the map by pressing Ctrl-9 key or when starting a saved game with Map enabled. Also in the mape is populated hwne the game is in Pause mode.

Author: sweiland-openrails

Source/RunActivity/Viewer3D/Map/MapForm.cs

@@ -123,6 +123,8 @@ public partial class MapViewer : Form
         private double lastUpdateTime;
 
         private bool MapCustomizationVisible = false;
+
+        private Form GameForm;
         #endregion
 
         public MapViewer(Simulator simulator, Viewer viewer)
@@ -154,6 +156,8 @@ public MapViewer(Simulator simulator, Viewer viewer)
                 AddNewMessage(e.Time, e.Message);
             };
 
+            GameForm = (Form)System.Windows.Forms.Control.FromHandle(Viewer.Game.Window.Handle); // qqq
+
             // Initialise the timer used to handle user input
             UITimer = new Timer();
             UITimer.Interval = 100;
@@ -1338,6 +1342,13 @@ void UITimer_Tick(object sender, EventArgs e)
             }
             Visible = true;
 
+            if (Viewer.MapViewerEnabledSetToTrue)
+            {
+                GenerateView();
+                GameForm.Focus();
+                Viewer.MapViewerEnabledSetToTrue = false;
+            }
+
             if (Program.Simulator.GameTime - lastUpdateTime < 1)
                 return;
 

Source/RunActivity/Viewer3D/Viewer.cs

@@ -192,6 +192,8 @@ void CameraActivate()
         public Vector3 FarPoint { get; private set; }
 
         public bool MapViewerEnabled { get; set; } = false;
+        public bool MapViewerEnabledSetToTrue {  get; set; } = false;
+
         public bool SoundDebugFormEnabled { get; set; }
 
         public TRPFile TRP; // Track profile file
@@ -421,6 +423,10 @@ public void Restore(BinaryReader inf)
 
             WindowManager.Restore(inf);
             MapViewerEnabled = inf.ReadBoolean();
+            if (MapViewerEnabled)
+            {
+                MapViewerEnabledSetToTrue = true;
+            }
 
             var cameraToRestore = inf.ReadInt32();
             foreach (var camera in WellKnownCameras)
@@ -1171,7 +1177,15 @@ void HandleUserInput(ElapsedTime elapsedTime)
             if (UserInput.IsPressed(UserCommand.GameSwitchManualMode)) PlayerTrain.RequestToggleManualMode();
             if (UserInput.IsPressed(UserCommand.GameResetOutOfControlMode)) new ResetOutOfControlModeCommand(Log);
 
-            if (UserInput.IsPressed(UserCommand.GameMultiPlayerDispatcher)) { MapViewerEnabled = !MapViewerEnabled; return; }
+            if (UserInput.IsPressed(UserCommand.GameMultiPlayerDispatcher)) 
+            { 
+                MapViewerEnabled = !MapViewerEnabled; 
+                if (MapViewerEnabled)
+                {
+                    MapViewerEnabledSetToTrue = true;
+                }
+                return; 
+            }
             if (UserInput.IsPressed(UserCommand.DebugSoundForm)) { SoundDebugFormEnabled = !SoundDebugFormEnabled; return; }
 
             if (UserInput.IsPressed(UserCommand.CameraJumpSeeSwitch))