diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-14 22:39:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-14 22:39:54 +0300 |
| commit | face5047d0d2f36018bd32541501fc0263b40086 (patch) | |
| tree | de5b221d5216044bec8d9200b334112439b245b2 /source/blender | |
| parent | 163d8111bea1e6c6a46a75bf77c024021beb7b6d (diff) | |
Fix #20113: CLICK events stop working when opening a new file.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 906a166a28c..710f9897c94 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -828,7 +828,7 @@ static int wm_eventmatch(wmEvent *winevent, wmKeyMapItem *kmi) 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 @@ void wm_event_do_handlers(bContext *C) } /* 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) */ |