Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

2022-09-29 12:13:55 -03:00
parent 2d5cff1752 9ae6e35760
commit 77c63541eb
602 changed files with 19759 additions and 16312 deletions
@@ -55,6 +55,10 @@ namespace Barotrauma

 #if LINUX
            setLinuxEnv();
+            AppDomain.CurrentDomain.ProcessExit += (s, e) => 
+            {
+                GameMain.ShouldRun = false;
+            };
 #endif
            Console.WriteLine("Barotrauma Dedicated Server " + GameMain.Version +
                " (" + AssemblyInfo.BuildString + ", branch " + AssemblyInfo.GitBranch + ", revision " + AssemblyInfo.GitRevision + ")");
@@ -102,7 +106,7 @@ namespace Barotrauma
        
        private static void CrashHandler(object sender, UnhandledExceptionEventArgs args)
        {
-            void swallowExceptions(Action action)
+            static void swallowExceptions(Action action)
            {
                try
                {