Commita49f3a8

authored

Take GIL when checking if error occurred on shutdown (#1836)

1 parent70e2e0a commita49f3a8Copy full SHA for a49f3a8

File tree

-4

lines changed

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,12 +355,17 @@ public static void Shutdown()`
`355`	`355`	`{`
`356`	`356`	`return;`
`357`	`357`	`}`
`358`		`-if(Exceptions.ErrorOccurred())`
	`358`	`+`
	`359`	`+using(Py.GIL())`
`359`	`360`	`{`
`360`		`-thrownewInvalidOperationException(`
`361`		`-"Python error indicator is set",`
`362`		`-innerException:PythonException.PeekCurrentOrNull(out_));`
	`361`	`+if(Exceptions.ErrorOccurred())`
	`362`	`+{`
	`363`	`+thrownewInvalidOperationException(`
	`364`	`+"Python error indicator is set",`
	`365`	`+innerException:PythonException.PeekCurrentOrNull(out_));`
	`366`	`+}`
`363`	`367`	`}`
	`368`	`+`
`364`	`369`	`// If the shutdown handlers trigger a domain unload,`
`365`	`370`	`// don't call shutdown again.`
`366`	`371`	`AppDomain.CurrentDomain.DomainUnload-=OnDomainUnload;`

Comments

(0)