Merge pull request #2183 from MediaBrowser/dev

Dev

1 files changed, 17 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index d8d3614e6..9312e1501 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -873,6 +873,23 @@ namespace MediaBrowser.Server.Startup.Common
             try
             {
                 ServerManager.Start(GetUrlPrefixes(), CertificatePath);
+                return;
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error starting http server", ex);
+
+                if (HttpPort == 8096)
+                {
+                    throw;
+                }
+            }
+
+            HttpPort = 8096;
+
+            try
+            {
+                ServerManager.Start(GetUrlPrefixes(), CertificatePath);
             }
             catch (Exception ex)
             {