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

Bugfix #26021

Browse Source 
On certain buttons, and only when not in triple buffer, pressing
RMB "Add shortcut" crashed Blender. NULL check missing.
This commit is contained in:
Ton Roosendaal 2011-02-11 18:29:52 +00:00
parent 91b967c79a
commit 8e7a61b1c4
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/interface/interface_handlers.c
View File

@ -4684,19 +4684,21 @@ static void button_timers_tooltip_remove(bContext *C, uiBut *but)
uiHandleButtonData *data; uiHandleButtonData *data;
data= but->active; data= but->active;
if(data) {
if(data->tooltiptimer) { if(data->tooltiptimer) {
WM_event_remove_timer(data->wm, data->window, data->tooltiptimer); WM_event_remove_timer(data->wm, data->window, data->tooltiptimer);
data->tooltiptimer= NULL; data->tooltiptimer= NULL;
} }
if(data->tooltip) { if(data->tooltip) {
ui_tooltip_free(C, data->tooltip); ui_tooltip_free(C, data->tooltip);
data->tooltip= NULL; data->tooltip= NULL;
} }
if(data->autoopentimer) { if(data->autoopentimer) {
WM_event_remove_timer(data->wm, data->window, data->autoopentimer); WM_event_remove_timer(data->wm, data->window, data->autoopentimer);
data->autoopentimer= NULL; data->autoopentimer= NULL;
}
} }
} }