diff options
| author | Elijah Newren <newren@math.utah.edu> | 2004-08-08 04:11:33 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2004-08-08 04:11:33 +0000 |
| commit | 118a1fb76a0b32ddb6346cb8e647fb62900d5790 (patch) | |
| tree | 83b5c088751539171b089b4e50ac684ae03eecc3 /src | |
| parent | bd73853f72c7a128c5fa750e7adce64b354c036f (diff) | |
| download | metacity-118a1fb76a0b32ddb6346cb8e647fb62900d5790.tar.gz | |
activating the current workspace should be a no-op. This prevents a race
2004-08-07 Elijah Newren <newren@math.utah.edu>
* src/display.c (event_callback): activating the current workspace
should be a no-op. This prevents a race condition in focus window
choice when activating a window via the taskbar. Fix for #149589.
Diffstat (limited to 'src')
| -rw-r--r-- | src/display.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/display.c b/src/display.c index 29685106..86f62bf9 100644 --- a/src/display.c +++ b/src/display.c @@ -2057,8 +2057,13 @@ event_callback (XEvent *event, if (workspace) { - meta_workspace_activate (workspace); - meta_workspace_focus_default_window (workspace, NULL); + if (workspace != screen->active_workspace) + { + meta_workspace_activate (workspace); + meta_workspace_focus_default_window (workspace, NULL); + } + else + meta_verbose ("Workspace %d already active.\n", space); } else meta_verbose ("Don't know about workspace %d\n", space); |