@@ -39,18 +39,21 @@ bool PyUnicodeOrString_Check(PyObject *py_obj) {
 
 void FUnrealEnginePythonModule::PythonGILRelease() {
 #if UEPY_THREADING
-	if (PyGILState_Check()) {
+	if (PyGILState_Check() == 1) {
 		ue_python_gil = PyEval_SaveThread();
 	}
 #endif
 }
 
-void FUnrealEnginePythonModule::PythonGILAcquire() {
+bool FUnrealEnginePythonModule::PythonGILAcquire() {
 #if UEPY_THREADING
-	if (!PyGILState_Check()) {
+	if (PyGILState_Check() == 0) {
 		PyEval_RestoreThread((PyThreadState *)ue_python_gil);
+		return true;
 	}
+	return false;
 #endif
+	return true;
 }
 
 void FUnrealEnginePythonModule::StartupModule()
 
@@ -11,7 +11,7 @@ class UNREALENGINEPYTHON_API FUnrealEnginePythonModule : public IModuleInterface
 {
 public:
 
-	void PythonGILAcquire();
+	bool PythonGILAcquire();
 	void PythonGILRelease();
 
 	virtual void StartupModule() override;
@@ -32,18 +32,21 @@ struct FScopePythonGIL {
 	{
 #if UEPY_THREADING
 		UnrealEnginePythonModule = FModuleManager::LoadModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");
-		UnrealEnginePythonModule.PythonGILAcquire();
+		safeForRelease = UnrealEnginePythonModule.PythonGILAcquire();
 #endif
 	}
 
 	~FScopePythonGIL()
 	{
 #if UEPY_THREADING
-		UnrealEnginePythonModule.PythonGILRelease();
+		if (safeForRelease) {
+			UnrealEnginePythonModule.PythonGILRelease();
+		}
 #endif
 	}
 
 	FUnrealEnginePythonModule UnrealEnginePythonModule;
+	bool safeForRelease;
 };
Original file line number	Diff line number	Diff line change
`@@ -39,18 +39,21 @@ bool PyUnicodeOrString_Check(PyObject *py_obj) {`
`39`	`39`
`40`	`40`	`void FUnrealEnginePythonModule::PythonGILRelease() {`
`41`	`41`	`#if UEPY_THREADING`
`42`		`- if (PyGILState_Check()) {`
	`42`	`+ if (PyGILState_Check() == 1) {`
`43`	`43`	`ue_python_gil = PyEval_SaveThread();`
`44`	`44`	`}`
`45`	`45`	`#endif`
`46`	`46`	`}`
`47`	`47`
`48`		`-void FUnrealEnginePythonModule::PythonGILAcquire() {`
	`48`	`+bool FUnrealEnginePythonModule::PythonGILAcquire() {`
`49`	`49`	`#if UEPY_THREADING`
`50`		`- if (!PyGILState_Check()) {`
	`50`	`+ if (PyGILState_Check() == 0) {`
`51`	`51`	`PyEval_RestoreThread((PyThreadState *)ue_python_gil);`
	`52`	`+ return true;`
`52`	`53`	`}`
	`54`	`+ return false;`
`53`	`55`	`#endif`
	`56`	`+ return true;`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`void FUnrealEnginePythonModule::StartupModule()`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class UNREALENGINEPYTHON_API FUnrealEnginePythonModule : public IModuleInterface`
`11`	`11`	`{`
`12`	`12`	`public:`
`13`	`13`
`14`		`- void PythonGILAcquire();`
	`14`	`+ bool PythonGILAcquire();`
`15`	`15`	`void PythonGILRelease();`
`16`	`16`
`17`	`17`	`virtual void StartupModule() override;`
`@@ -32,18 +32,21 @@ struct FScopePythonGIL {`
`32`	`32`	`{`
`33`	`33`	`#if UEPY_THREADING`
`34`	`34`	`UnrealEnginePythonModule = FModuleManager::LoadModuleChecked<FUnrealEnginePythonModule>("UnrealEnginePython");`
`35`		`- UnrealEnginePythonModule.PythonGILAcquire();`
	`35`	`+ safeForRelease = UnrealEnginePythonModule.PythonGILAcquire();`
`36`	`36`	`#endif`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`~FScopePythonGIL()`
`40`	`40`	`{`
`41`	`41`	`#if UEPY_THREADING`
`42`		`- UnrealEnginePythonModule.PythonGILRelease();`
	`42`	`+ if (safeForRelease) {`
	`43`	`+ UnrealEnginePythonModule.PythonGILRelease();`
	`44`	`+ }`
`43`	`45`	`#endif`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`FUnrealEnginePythonModule UnrealEnginePythonModule;`
	`49`	`+ bool safeForRelease;`
`47`	`50`	`};`
`48`	`51`
`49`	`52`