Don't call exit functions on soft or reload shutdown

BadSingleton · BadSingleton · commit 65cb22e97389 · 2020-08-19T11:52:11.000-04:00
This fixes the exit functions being called during soft shutdown or reload shutdown.
Also a small improvement to readability in Runtime.Shutdown.
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -317,7 +317,7 @@ internal static void Shutdown()
             PyGILState_Ensure();
 
             var mode = ShutdownMode;
-            if (mode != ShutdownMode.Normal)
+            if (mode == ShutdownMode.Normal)
             {
                 RunExitFuncs();
             }
@@ -361,10 +361,12 @@ internal static void Shutdown()
                     // Some clr runtime didn't implement GC.WaitForFullGCComplete yet.
                 }
                 PyEval_SaveThread();
-                return;
             }
-            ResetPyMembers();
-            Py_Finalize();
+            else
+            {
+                ResetPyMembers();
+                Py_Finalize();
+            }
         }
 
         internal static ShutdownMode GetDefaultShutdownMode()

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ internal static void Shutdown()`
`317`	`317`	`PyGILState_Ensure();`
`318`	`318`
`319`	`319`	`var mode = ShutdownMode;`
`320`		`- if (mode != ShutdownMode.Normal)`
	`320`	`+ if (mode == ShutdownMode.Normal)`
`321`	`321`	`{`
`322`	`322`	`RunExitFuncs();`
`323`	`323`	`}`
`@@ -361,10 +361,12 @@ internal static void Shutdown()`
`361`	`361`	`// Some clr runtime didn't implement GC.WaitForFullGCComplete yet.`
`362`	`362`	`}`
`363`	`363`	`PyEval_SaveThread();`
`364`		`- return;`
`365`	`364`	`}`
`366`		`- ResetPyMembers();`
`367`		`- Py_Finalize();`
	`365`	`+ else`
	`366`	`+ {`
	`367`	`+ ResetPyMembers();`
	`368`	`+ Py_Finalize();`
	`369`	`+ }`
`368`	`370`	`}`
`369`	`371`
`370`	`372`	`internal static ShutdownMode GetDefaultShutdownMode()`