Merge pull request #16 from js6pak/fix-exit-crash

nike4613 · web-flow · commit a63e46a8e438 · 2026-01-30T14:15:38.000-06:00
Fix Gen2GcCallback causing crashes during shutdown on mono
diff --git a/src/MonoMod.Backports/System/Gen2GcCallback.cs b/src/MonoMod.Backports/System/Gen2GcCallback.cs
@@ -108,8 +108,11 @@ public static void Register(Func<object, bool> callback, object targetObj)
                 }
             }
 
-            // Resurrect ourselves by re-registering for finalization.
-            GC.ReRegisterForFinalize(this);
+            if (!Environment.HasShutdownStarted)
+            {
+                // Resurrect ourselves by re-registering for finalization.
+                GC.ReRegisterForFinalize(this);
+            }
         }
 #pragma warning restore CA1031 // Do not catch general exception types
     }

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,11 @@ public static void Register(Func<object, bool> callback, object targetObj)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- // Resurrect ourselves by re-registering for finalization.`
`112`		`- GC.ReRegisterForFinalize(this);`
	`111`	`+ if (!Environment.HasShutdownStarted)`
	`112`	`+ {`
	`113`	`+ // Resurrect ourselves by re-registering for finalization.`
	`114`	`+ GC.ReRegisterForFinalize(this);`
	`115`	`+ }`
`113`	`116`	`}`
`114`	`117`	`#pragma warning restore CA1031 // Do not catch general exception types`
`115`	`118`	`}`