blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

Fix crash running an operator from a popup, 

Cell fracture redraw option was crashing.
Change operator popup behavior to close the UI before executing
since the operator may perform operations which change/remove the UI.
This commit is contained in:
Campbell Barton 2019-07-07 22:30:19 +10:00
parent 414875ce96
commit 9e12d762a2
Notes: blender-bot 2023-02-14 19:19:56 +01:00 
Referenced by issue blender/blender-addons#61443, ExportHelper crashes with exit code 3221226356 when called
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/windowmanager/intern/wm_operators.c
View File

@ -1151,38 +1151,27 @@ typedef struct wmOpPopUp {
/* Only invoked by OK button in popups created with wm_block_dialog_create() */
static void dialog_exec_cb(bContext *C, void *arg1, void *arg2)
{
wmOpPopUp *data = arg1;
uiBlock *block = arg2;
wmOperator *op;
{
/* Execute will free the operator.
* In this case, wm_operator_ui_popup_cancel wont run. */
wmOpPopUp *data = arg1;
op = data->op;
MEM_freeN(data);
}
uiBlock *block = arg2;
/* Explicitly set UI_RETURN_OK flag, otherwise the menu might be canceled
* in case WM_operator_call_ex exits/reloads the current file (T49199). */
UI_popup_menu_retval_set(block, UI_RETURN_OK, true);
WM_operator_call_ex(C, data->op, true);
/* let execute handle freeing it */
// data->free_op = false;
// data->op = NULL;
/* in this case, wm_operator_ui_popup_cancel wont run */
MEM_freeN(data);
/* Get context data *after* WM_operator_call_ex
* which might have closed the current file and changed context. */
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win = CTX_wm_window(C);
UI_popup_block_close(C, win, block);
/* check window before 'block->handle' incase the
* popup execution closed the window and freed the block. see T44688.
*/
/* Post 2.78 TODO: Check if this fix and others related to T44688 are still
* needed or can be improved now that requesting context data has been corrected
* (see above). We're close to release so not a good time for experiments.
* -- Julian
*/
if (BLI_findindex(&wm->windows, win) != -1) {
UI_popup_block_close(C, win, block);
}
WM_operator_call_ex(C, op, true);
}
/* Dialogs are popups that require user verification (click OK) before exec */