diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-18 11:39:56 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-18 11:39:56 -0500 |
| commit | 965ed8907a5dd81d5ffbc93b67a672fa78833854 (patch) | |
| tree | 9e02aed49fd664e5d5b73e417d4a2b5b73e793a3 /openbox/event.c | |
| parent | aeac6294a3c45c10d04f108a6fc767298132735c (diff) | |
| parent | 01fd9f99cc5cbe4783a7b7807b51b87269250212 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/screen.c
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/openbox/event.c b/openbox/event.c index 1caa8acc..63f23ff9 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1948,9 +1948,6 @@ static gboolean focus_delay_func(gpointer data) ObFocusDelayData *d = data; Time old = event_curtime; - /* don't move focus and kill the menu or the move/resize */ - if (menu_frame_visible || moveresize_in_progress) return FALSE; - event_curtime = d->time; event_curserial = d->serial; if (client_focus(d->client) && config_focus_raise) |