Automatic merge of T1.6-139-g6b62c2a7d and 13 pull requests

- Pull request #1082 at 8538170: Allow variable water level in glass gauge
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1122 at 73c47b4: Wagon Size and Centering Controls
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1128 at d116396: Particle Emitter Overhaul
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler
- Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9.
- Pull request #1164 at 1ad9889: Fix: F9 crashes with a front coupled single steam locomotive by Csantucci.
- Pull request #1166 at 51e7f7a: Simplify loading of internal and game textures
- Pull request #1167 at 115325f: Fix: RunActivity slow to terminate because of long sleep in Host Process
- Pull request #1168 at 6e2942f: Fix exception when exiting with MapForm or SoundDebugForm open.

Author: openrails-bot

Source/RunActivity/Viewer3D/Processes/GameStateViewer3D.cs

@@ -131,10 +131,7 @@ internal override void Dispose()
                 MPManager.Client.Stop();
             if (Program.Simulator != null)
                 Program.Simulator.Stop();
-            if (Program.MapForm != null)
-                Program.MapForm.Dispose();
-            if (Program.SoundDebugForm != null)
-                Program.SoundDebugForm.Dispose();
+            // MapForm and SoundDebugForm run in the Renderer thread and need to be disposed there
             base.Dispose();
         }
 

Source/RunActivity/Viewer3D/Processes/RenderProcess.cs

@@ -359,6 +359,12 @@ internal void EndDraw()
         internal void Stop()
         {
             Game.WatchdogProcess.Unregister(WatchdogToken);
+
+            // these run in the Renderer thread, and thus cannot be disposed in GameStateViewer3D
+            if (Program.MapForm != null)
+                Program.MapForm.Dispose();
+            if (Program.SoundDebugForm != null)
+                Program.SoundDebugForm.Dispose();
         }
 
         static void SwapFrames(ref RenderFrame frame1, ref RenderFrame frame2)