adds check for webserver port in use

Also adds missing save of webserver port value

Author: Chris Jakeman

Source/Menu/Options.Designer.cs

@@ -434,6 +434,7 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.PressureUnit = comboPressureUnit.SelectedValue.ToString();
             Settings.Units = comboOtherUnits.SelectedValue.ToString();
             Settings.DisableTCSScripts = checkDisableTCSScripts.Checked;
+            Settings.WebServerPort = (int)numericWebServerPort.Value;
 
             // Audio tab
             Settings.SoundVolumePercent = (int)numericSoundVolumePercent.Value;

Source/Menu/Options.cs

@@ -26,6 +26,9 @@
 using System.IO;
 using System.Windows.Forms;
 using CancellationTokenSource = System.Threading.CancellationTokenSource;
+using System.Net.Sockets;
+using System.Diagnostics;
+using System;
 
 namespace Orts.Viewer3D.Processes
 {
@@ -63,8 +66,22 @@ void WebServerThread()
 
             string myWebContentPath = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "Content\\Web");
             EndPointManager.UseIpv6 = true;
-            using (EmbedIO.WebServer server = WebServer.CreateWebServer($"http://*:{Game.Settings.WebServerPort}", myWebContentPath))
-                server.RunAsync(StopServer.Token).Wait();
+            try
+            {
+                using (EmbedIO.WebServer server = WebServer.CreateWebServer($"http://*:{Game.Settings.WebServerPort}", myWebContentPath))
+                    server.RunAsync(StopServer.Token).Wait();
+            }
+            catch(AggregateException ex)
+            {
+                if (ex.InnerException is SocketException)
+                {
+                    Trace.TraceWarning($"Port {Game.Settings.WebServerPort} is already in use. Continuing without webserver");
+                }
+                else
+                {
+                    throw ex;
+                }
+            }
         }
     }
 }