Commit 06a31992 authored by Florian Müllner's avatar Florian Müllner
Browse files

screen: Tweak workspace initialization (again)

Commit 8100cefd fixed a crash during workspace initialization by
tweaking the startup sequence; as a result, the plugin (like gnome-shell)
is now started before workspaces are fully initialized, which breaks
some reasonable assumptions (like always having an active workspace).
This is particularly problematic considering that the code making those
assumptions is not necessarily our own (extensions!), so return to
fully initialize workspaces before the compositor again.
At the same time, make sure to only call meta_workspace_activate()
once during initialization to avoid reintroducing the crash.
parent 4e2092d5
......@@ -848,9 +848,10 @@ meta_display_open (void)
the_display->screen = screen;
meta_screen_init_workspaces (screen);
enable_compositor (the_display);
meta_screen_init_workspaces (screen);
meta_screen_create_guard_window (screen);
/* Set up touch support */
......@@ -786,7 +786,6 @@ meta_screen_init_workspaces (MetaScreen *screen)
meta_verbose ("No _NET_CURRENT_DESKTOP present\n");
meta_workspace_activate (screen->workspaces->data, timestamp);
update_num_workspaces (screen, timestamp);
set_workspace_names (screen);
......@@ -797,6 +796,8 @@ meta_screen_init_workspaces (MetaScreen *screen)
if (current_workspace != NULL)
meta_workspace_activate (current_workspace, timestamp);
meta_workspace_activate (screen->workspaces->data, timestamp);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment