[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48211] branches/soc-2012-bratwurst/source /blender/editors/interface/interface_handlers.c: This fixes some of the problems associated with r48184, the drag-toggle patch

[Jorge Rodriguez]

Revision: 48211
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48211
Author:   vino
Date:     2012-06-22 21:10:43 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
This fixes some of the problems associated with r48184, the drag-toggle patch

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48184

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-22 19:40:58 UTC (rev 48210)
+++ branches/soc-2012-bratwurst/source/blender/editors/interface/interface_handlers.c	2012-06-22 21:10:43 UTC (rev 48211)
@@ -2240,7 +2240,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 
-		if (ELEM(G.drag_button_func, but->func, but->rnaprop) && G.drag_button_state == (ui_get_but_val(but) == 0))
+		if (G.drag_button_func != NULL && ELEM(G.drag_button_func, but->func, but->rnaprop) && G.drag_button_state == (ui_get_but_val(but) == 0))
 		{
 			wmWindow *win = CTX_wm_window(C);