Commit: b54e95a5c8dcb7eae1059af107a7cdfa028d7e2e
Author: Campbell Barton
Date: Mon Jun 8 15:57:42 2015 +1000
Branches: master
https://developer.blender.org/rBb54e95a5c8dcb7eae1059af107a7cdfa028d7e2e
Alternative fix copying windows from popup dialogs
It could still crash if the window was freed and another was activated. see
T44688.
===================================================================
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_regions.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index 0b400e2..ef0a57f 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -401,7 +401,7 @@ void UI_popup_block_invoke_ex(struct bContext *C,
uiBlockCreateFunc func, void *
void UI_popup_block_ex(struct bContext *C, uiBlockCreateFunc func,
uiBlockHandleFunc popup_func, uiBlockCancelFunc cancel_func, void *arg);
/* void uiPupBlockOperator(struct bContext *C, uiBlockCreateFunc func, struct
wmOperator *op, int opcontext); */ /* UNUSED */
-void UI_popup_block_close(struct bContext *C, uiBlock *block);
+void UI_popup_block_close(struct bContext *C, struct wmWindow *win, uiBlock
*block);
/* Blocks
*
diff --git a/source/blender/editors/interface/interface_regions.c
b/source/blender/editors/interface/interface_regions.c
index 9835f08..da2852c 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -3049,16 +3049,11 @@ void uiPupBlockOperator(bContext *C, uiBlockCreateFunc
func, wmOperator *op, int
}
#endif
-void UI_popup_block_close(bContext *C, uiBlock *block)
+void UI_popup_block_close(bContext *C, wmWindow *win, uiBlock *block)
{
- wmWindow *win = CTX_wm_window(C);
-
- /* check window before 'block->handle' incase the
- * popup execution closed the window and freed the block. see T44688. */
-
/* if loading new .blend while popup is open, window will be NULL */
- if (win) {
- if (block->handle) {
+ if (block->handle) {
+ if (win) {
UI_popup_handlers_remove(&win->modalhandlers,
block->handle);
ui_popup_block_free(C, block->handle);
}
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 3c23f73..041ef6f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1554,6 +1554,9 @@ 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)
{
+ wmWindowManager *wm = CTX_wm_manager(C);
+ wmWindow *win = CTX_wm_window(C);
+
wmOpPopUp *data = arg1;
uiBlock *block = arg2;
@@ -1566,7 +1569,11 @@ static void dialog_exec_cb(bContext *C, void *arg1, void
*arg2)
/* in this case, wm_operator_ui_popup_cancel wont run */
MEM_freeN(data);
- UI_popup_block_close(C, block);
+ /* check window before 'block->handle' incase the
+ * popup execution closed the window and freed the block. see T44688. */
+ if (BLI_findindex(&wm->windows, win) != -1) {
+ UI_popup_block_close(C, win, block);
+ }
}
static void dialog_check_cb(bContext *C, void *op_ptr, void *UNUSED(arg))
@@ -1840,7 +1847,8 @@ static void WM_OT_operator_defaults(wmOperatorType *ot)
static void wm_block_splash_close(bContext *C, void *arg_block, void
*UNUSED(arg))
{
- UI_popup_block_close(C, arg_block);
+ wmWindow *win = CTX_wm_window(C);
+ UI_popup_block_close(C, win, arg_block);
}
static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void
*arg_unused);
@@ -1852,7 +1860,8 @@ static void wm_block_splash_refreshmenu(bContext
*UNUSED(C), void *UNUSED(arg_bl
/* ugh, causes crashes in other buttons, disabling for now until
* a better fix */
#if 0
- UI_popup_block_close(C, arg_block);
+ wmWindow *win = CTX_wm_window(C);
+ UI_popup_block_close(C, win, arg_block);
UI_popup_block_invoke(C, wm_block_create_splash, NULL);
#endif
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
