diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-07-06 07:41:59 (GMT) |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2009-07-06 07:43:07 (GMT) |
| commit | 4be8e155d14b0900c87892d451d676d70e3bd864 (patch) | |
| tree | d799ea035d6d46fd5ebf4974a2373f01b6805191 | |
| parent | 6726fcd25dbd335ec64a2415bb6aacf79903c6ae (diff) | |
| download | mutter-4be8e155d14b0900c87892d451d676d70e3bd864.zip mutter-4be8e155d14b0900c87892d451d676d70e3bd864.tar.xz | |
Fix crash when starting not on first workspace
If we are starting on something other than the first workspace,
meta_compositor_switch_workspace() will be called before
meta_compositor_manage_screen(); guard against that.
| -rw-r--r-- | src/compositor/compositor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index a6130e7..9bcdb38 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -691,6 +691,9 @@ meta_compositor_switch_workspace (MetaCompositor *compositor, DEBUG_TRACE ("meta_compositor_switch_workspace\n"); + if (!info) /* During startup before manage_screen() */ + return; + info->switch_workspace_in_progress++; if (!info->plugin_mgr || |