aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 547432bc2d..c9e8d46317 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -525,6 +525,12 @@ shell_constructed (GObject *object)
shell_load_modules (E_SHELL (object));
shell_create_backends (E_SHELL (object));
+
+ /* e_shell_migrate_attempt() leads to code paths that rely on
+ * e_shell_get_default(), so set the default shell first. */
+ if (default_shell == NULL)
+ default_shell = g_object_ref (object);
+
e_shell_migrate_attempt (E_SHELL (object));
}