[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25380] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Fix #20113: CLICK events stop working when opening a new file.

[Brecht Van Lommel]

Revision: 25380
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25380
Author:   blendix
Date:     2009-12-14 20:39:54 +0100 (Mon, 14 Dec 2009)

Log Message:
-----------
Fix #20113: CLICK events stop working when opening a new file.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2009-12-14 19:17:27 UTC (rev 25379)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2009-12-14 19:39:54 UTC (rev 25380)
@@ -828,7 +828,7 @@
 static int wm_event_always_pass(wmEvent *event)
 {
 	/* some events we always pass on, to ensure proper communication */
-	return ELEM5(event->type, TIMER, TIMER0, TIMER1, TIMER2, WINDEACTIVATE);
+	return ISTIMER(event->type) || (event->type == WINDEACTIVATE);
 }
 
 /* operator exists */
@@ -1367,8 +1367,8 @@
 			}
 			
 			/* store last event for this window */
-			/* mousemove event don't overwrite last type */
-			if (event->type != MOUSEMOVE) {
+			/* mousemove and timer events don't overwrite last type */
+			if (event->type != MOUSEMOVE && !ISTIMER(event->type)) {
 				if (wm_action_not_handled(action)) {
 					if (win->last_type == event->type) {
 						/* set click time on first click (press -> release) */