diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-11 21:29:52 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-11 21:29:52 +0300 |
| commit | 8e7a61b1c40851e4b0efa82a84fd9b9fd7c43640 (patch) | |
| tree | b2199c61901fecae1d0baa3e185d5c5b788faf40 /source/blender/editors/interface | |
| parent | 91b967c79aa83a98a1c697120ce57d18b7e7970b (diff) | |
Bugfix #26021
On certain buttons, and only when not in triple buffer, pressing
RMB "Add shortcut" crashed Blender. NULL check missing.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b802098ff10..d912610637f 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4684,19 +4684,21 @@ static void button_timers_tooltip_remove(bContext *C, uiBut *but) uiHandleButtonData *data; data= but->active; + if(data) { - if(data->tooltiptimer) { - WM_event_remove_timer(data->wm, data->window, data->tooltiptimer); - data->tooltiptimer= NULL; - } - if(data->tooltip) { - ui_tooltip_free(C, data->tooltip); - data->tooltip= NULL; - } + if(data->tooltiptimer) { + WM_event_remove_timer(data->wm, data->window, data->tooltiptimer); + data->tooltiptimer= NULL; + } + if(data->tooltip) { + ui_tooltip_free(C, data->tooltip); + data->tooltip= NULL; + } - if(data->autoopentimer) { - WM_event_remove_timer(data->wm, data->window, data->autoopentimer); - data->autoopentimer= NULL; + if(data->autoopentimer) { + WM_event_remove_timer(data->wm, data->window, data->autoopentimer); + data->autoopentimer= NULL; + } } } |