Build 0.18.2.0

2022-05-19 23:43:21 +09:00
parent d4f6f4cf88
commit 077917fa5d
115 changed files with 1080 additions and 1763 deletions
@@ -429,8 +429,8 @@ namespace Barotrauma.IO

    public class FileStream : System.IO.Stream
    {
-        private System.IO.FileStream innerStream;
-        private string fileName;
+        private readonly System.IO.FileStream innerStream;
+        private readonly string fileName;

        public FileStream(string fn, System.IO.FileStream stream)
        {
@@ -496,9 +496,9 @@ namespace Barotrauma.IO
            innerStream.Flush();
        }

-        protected override void Dispose(bool disposing)
+        protected override void Dispose(bool notCalledByFinalizer)
        {
-            innerStream.Dispose();
+            if (notCalledByFinalizer) { innerStream.Dispose(); }
        }
    }