kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

2.5

Browse Source 
Fix crashing in pop-up menus when click.
There's something wrong still in handling menu itself, need Brecht
too look at that... probably a wrong return value somewhere.
This commit is contained in:
Ton Roosendaal 2008-12-03 15:49:41 +00:00
parent 1c81b97481
commit 880710cfb0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface_ops.c
View File

@ -2941,10 +2941,11 @@ static int button_activate_modal(bContext *C, wmOperator *op, wmEvent *event)
} }
break; break;
default:
handled= ui_do_button(C, block, but, event);
} }
} }
handled= ui_do_button(C, block, but, event);
} }
else if(data->state == BUTTON_STATE_WAIT_RELEASE) { else if(data->state == BUTTON_STATE_WAIT_RELEASE) {
switch(event->type) { switch(event->type) {
@ -3248,6 +3249,10 @@ static int menu_block_handle_modal(bContext *C, wmOperator *op, wmEvent *event)
ar= bhandle->region; ar= bhandle->region;
block= ar->uiblocks.first; block= ar->uiblocks.first;
/* XXX (for brecht) this happens when click on menu */
if(block==NULL)
return OPERATOR_FINISHED;
act= 0; act= 0;
handled= 0; handled= 0;