Reverted removal of a fix and added a comment (SubnauticaNitrox#1069)

Measurity · web-flow · commit 7cc89da792ae · 2020-04-28T16:53:32.000-07:00
diff --git a/NitroxServer-Subnautica/Program.cs b/NitroxServer-Subnautica/Program.cs
@@ -91,13 +91,16 @@ private static void CatchExitEvent()
             // better catch using WinAPI. This will handled process kill
             if (platid == PlatformID.Win32NT)
             {
-                SetConsoleCtrlHandler(ConsoleEventCallback, true);
+                SetConsoleCtrlHandler(consoleCtrlCheckDelegate, true);
             }
         }
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static extern bool SetConsoleCtrlHandler(ConsoleEventDelegate callback, bool add);
 
+        // Prevents Garbage Collection issue where server closes and an exception occurs for this handle.
+        private static readonly ConsoleEventDelegate consoleCtrlCheckDelegate = ConsoleEventCallback;
+        
         private static bool ConsoleEventCallback(int eventType)
         {
             if (eventType == 2) // close

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,16 @@ private static void CatchExitEvent()`
`91`	`91`	`// better catch using WinAPI. This will handled process kill`
`92`	`92`	`if (platid == PlatformID.Win32NT)`
`93`	`93`	`{`
`94`		`- SetConsoleCtrlHandler(ConsoleEventCallback, true);`
	`94`	`+ SetConsoleCtrlHandler(consoleCtrlCheckDelegate, true);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`[DllImport("kernel32.dll", SetLastError = true)]`
`99`	`99`	`private static extern bool SetConsoleCtrlHandler(ConsoleEventDelegate callback, bool add);`
`100`	`100`
	`101`	`+ // Prevents Garbage Collection issue where server closes and an exception occurs for this handle.`
	`102`	`+ private static readonly ConsoleEventDelegate consoleCtrlCheckDelegate = ConsoleEventCallback;`
	`103`	`+`
`101`	`104`	`private static bool ConsoleEventCallback(int eventType)`
`102`	`105`	`{`
`103`	`106`	`if (eventType == 2) // close`