This repository was archived by the owner on Jul 22, 2023. It is now read-only.
Commit 65cb22e
committed
Don't call exit functions on soft or reload shutdown
This fixes the exit functions being called during soft shutdown or reload shutdown.
Also a small improvement to readability in Runtime.Shutdown.1 parent 5ac75ba commit 65cb22e
1 file changed
Lines changed: 6 additions & 4 deletions
| 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() | |
0 commit comments