archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T42005: Reset py-handlers could crash

Browse Source 
Wasn't acquiring the GIL.
This commit is contained in:
Campbell Barton
2014-10-13 17:44:27 +02:00
parent e72d8b4711
commit cf38b933f3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/python/intern/bpy_app_handlers.c
View File

@@ -240,8 +240,11 @@ PyObject *BPY_app_handlers_struct(void)
void BPY_app_handlers_reset(const short do_all) void BPY_app_handlers_reset(const short do_all)
{ {
PyGILState_STATE gilstate;
int pos = 0; int pos = 0;
gilstate = PyGILState_Ensure();
if (do_all) { if (do_all) {
for (pos = 0; pos < BLI_CB_EVT_TOT; pos++) { for (pos = 0; pos < BLI_CB_EVT_TOT; pos++) {
/* clear list */ /* clear list */
@@ -279,6 +282,8 @@ void BPY_app_handlers_reset(const short do_all)
Py_DECREF(perm_id_str); Py_DECREF(perm_id_str);
} }
PyGILState_Release(gilstate);
} }
/* the actual callback - not necessarily called from py */ /* the actual callback - not necessarily called from py */