Merge remote-tracking branch 'origin/develop' into fix/liggghts-pfm

CFD-GO · Dec 26, 2022 · 68101fa · 68101fa
2 parents b41b178 + e11ef85
commit 68101fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Geometry.cpp.Rt b/src/Geometry.cpp.Rt
@@ -1074,9 +1074,6 @@ int Geometry::Draw(pugi::xml_node & node)
         }    
         // Make sure the GIL has been created since we need to acquire it in our
         // callback to safely call into the python application.
-        if (! PyEval_ThreadsInitialized()) {
-            PyEval_InitThreads();
-        }
 
         PyObject *pGlobal;
         PyObject* pyModule, *pLocal, *pValue;

diff --git a/src/Handlers/cbPythonCall.cpp b/src/Handlers/cbPythonCall.cpp
@@ -183,9 +183,10 @@ int cbPythonCall::DoIt () {
 
 	        }
 	        else {
-	            if (PyErr_Occurred())
+	            if (PyErr_Occurred()) {
 	                PyErr_Print();
-	                error("PythonCall: Cannot find function \"%s\"\n", function.value());
+                        error("PythonCall: Cannot find function \"%s\"\n", function.value());
+                    }
 	        }
 	        Py_XDECREF(pFunc);
 	        Py_DECREF(pModule);