diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2014-09-18 18:46:53 +0200 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2014-09-19 14:38:09 +0200 |
| commit | 57d502e2a8fe428957b42be0a79a4977cbc739a7 (patch) | |
| tree | ade8758db66ddc011fecd4cc68cc0890ee96fd1d /src/ephy-shell.c | |
| parent | 4901184fb986026196978cc49d0fb46af373299d (diff) | |
| download | epiphany-57d502e2a8fe428957b42be0a79a4977cbc739a7.tar.gz | |
ephy-shell: Do not try to resume the session in application mode
https://bugzilla.gnome.org/show_bug.cgi?id=736922
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index b05910835..374510a02 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -319,9 +319,12 @@ ephy_shell_activate (GApplication *application) * can be invalidated by another remote instance. */ if (priv->remote_startup_context == NULL) { - ephy_session_resume (ephy_shell_get_session (shell), - priv->local_startup_context->user_time, - NULL, session_load_cb, priv->local_startup_context); + if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (shell)) != EPHY_EMBED_SHELL_MODE_APPLICATION) { + ephy_session_resume (ephy_shell_get_session (shell), + priv->local_startup_context->user_time, + NULL, session_load_cb, priv->local_startup_context); + } else + ephy_shell_startup_continue (shell, priv->local_startup_context); } else { ephy_shell_startup_continue (shell, priv->remote_startup_context); g_clear_pointer (&priv->remote_startup_context, ephy_shell_startup_context_free); |