Merge remote-tracking branch 'upstream/master' into develop

2024-10-22 12:42:35 -03:00
parent 3e4b649162 a29662c074
commit 30a8f0c561
417 changed files with 17171 additions and 5895 deletions
@@ -160,7 +160,7 @@ namespace Barotrauma.Networking
            {
                try
                {
-                    Directory.CreateDirectory(SavePath);
+                    Directory.CreateDirectory(SavePath, catchUnauthorizedAccessExceptions: false);
                }
                catch (Exception e)
                {
@@ -182,12 +182,11 @@ namespace Barotrauma.Networking

            try
            {
-                File.WriteAllLines(filePath, unsavedLines.Select(l => l.Text.SanitizedValue));
+                File.WriteAllLines(filePath, unsavedLines.Select(l => l.Text.SanitizedValue), catchUnauthorizedAccessExceptions: false);
            }
            catch (Exception e)
            {
                DebugConsole.ThrowError("Saving the server log to " + filePath + " failed", e);
-                return;
            }
        }
    }