Merge pull request #739 from openrails/release/1.5

Merge pull request #731 from twpol/bugfix/multithread-crash

Author: Sharpe49

Source/RunActivity/Viewer3D/World.cs

@@ -17,6 +17,8 @@
 
 // This file is the responsibility of the 3D & Environment Team. 
 
+using System;
+using System.Diagnostics;
 using Microsoft.Xna.Framework;
 using Orts.Common;
 using ORTS.Common;
@@ -48,6 +50,7 @@ public class World
         int VisibleTileX;
         int VisibleTileZ;
         bool PerformanceTune;
+        bool MarkSweepError;
 
         [CallOnThread("Render")]
         public World(Viewer viewer, double gameTime)
@@ -100,25 +103,33 @@ public void Load()
             {
                 TileX = VisibleTileX;
                 TileZ = VisibleTileZ;
-                Viewer.ShapeManager.Mark();
-                Viewer.MaterialManager.Mark();
-                Viewer.TextureManager.Mark();
-                Viewer.SignalTypeDataManager.Mark();
-                if (Viewer.Settings.UseMSTSEnv)
-                    MSTSSky.Mark();
-                else
-                    Sky.Mark();
-                Precipitation.Mark();
-                Terrain.Mark();
-                Scenery.Mark();
-                Trains.Mark();
-                RoadCars.Mark();
-                Containers.Mark();
-                Viewer.Mark();
-                Viewer.ShapeManager.Sweep();
-                Viewer.MaterialManager.Sweep();
-                Viewer.TextureManager.Sweep();
-                Viewer.SignalTypeDataManager.Sweep();
+                try
+                {
+                    Viewer.ShapeManager.Mark();
+                    Viewer.MaterialManager.Mark();
+                    Viewer.TextureManager.Mark();
+                    Viewer.SignalTypeDataManager.Mark();
+                    if (Viewer.Settings.UseMSTSEnv)
+                        MSTSSky.Mark();
+                    else
+                        Sky.Mark();
+                    Precipitation.Mark();
+                    Terrain.Mark();
+                    Scenery.Mark();
+                    Trains.Mark();
+                    RoadCars.Mark();
+                    Containers.Mark();
+                    Viewer.Mark();
+                    Viewer.ShapeManager.Sweep();
+                    Viewer.MaterialManager.Sweep();
+                    Viewer.TextureManager.Sweep();
+                    Viewer.SignalTypeDataManager.Sweep();
+                }
+                catch (Exception error)
+                {
+                    if (!MarkSweepError) Trace.WriteLine(error);
+                    MarkSweepError = true;
+                }
             }
         }