fix: Removed leak warnings when CLR is shutting down or appdomain is …

…being unloaded
MidLevel · Sep 10, 2019 · 48ab3d3 · 48ab3d3
1 parent 16f48c3
commit 48ab3d3
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/Ruffles/Memory/HeapMemory.cs b/Ruffles/Memory/HeapMemory.cs
@@ -47,15 +47,18 @@ public void EnsureSize(uint size)
         ~HeapMemory()
         {
             try
-            {
-                if (!isDead)
-                {
-                    if (Logging.CurrentLogLevel <= LogLevel.Warning) Logging.LogWarning("Memory was just leaked from the MemoryManager [Size=" + Buffer.Length + "]");
-                }
-                else
+            {
+                // If shutdown of the CLR has started, or the application domain is being unloaded. We don't want to print leak warnings. As these are legitimate deallocs and not leaks.
+                if (!Environment.HasShutdownStarted)
                 {
-                    if (Logging.CurrentLogLevel <= LogLevel.Debug) Logging.LogWarning("Dead memory was just leaked from the MemoryManager [Size=" + _buffer.Length + "]");
-
+                    if (!isDead)
+                    {
+                        if (Logging.CurrentLogLevel <= LogLevel.Warning) Logging.LogWarning("Memory was just leaked from the MemoryManager [Size=" + Buffer.Length + "]");
+                    }
+                    else
+                    {
+                        if (Logging.CurrentLogLevel <= LogLevel.Debug) Logging.LogWarning("Dead memory was just leaked from the MemoryManager [Size=" + _buffer.Length + "]");
+                    }
                 }
             }
             catch