[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34783] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Bugfix #26021
Ton Roosendaal
ton at blender.org
Fri Feb 11 19:29:53 CET 2011
Revision: 34783
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34783
Author: ton
Date: 2011-02-11 18:29:52 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
Bugfix #26021
On certain buttons, and only when not in triple buffer, pressing
RMB "Add shortcut" crashed Blender. NULL check missing.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-02-11 18:23:00 UTC (rev 34782)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-02-11 18:29:52 UTC (rev 34783)
@@ -4684,19 +4684,21 @@
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;
+ }
}
}
More information about the Bf-blender-cvs
mailing list