From 5bf71aaa68f405240e43e8365d6ec31df4e216f8 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Sun, 9 Jun 2013 19:40:01 -0300 Subject: Move profile directory check to after checking for application mode Since application mode also has a profile directory, we will enter the non-app-mode profile shell mode instead. --- src/ephy-main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ephy-main.c b/src/ephy-main.c index ac8fc96c5..96ac40b31 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -428,13 +428,7 @@ main (int argc, /* Now create the shell */ if (private_instance) mode = EPHY_EMBED_SHELL_MODE_PRIVATE; - else if (profile_directory) { - /* This mode exists purely for letting EphyShell know it should - * not consider this instance part of the unique application - * represented by the BROWSER mode. - */ - mode = EPHY_EMBED_SHELL_MODE_STANDALONE; - } else if (incognito_mode) { + else if (incognito_mode) { mode = EPHY_EMBED_SHELL_MODE_INCOGNITO; /* Use the right theming. */ @@ -465,6 +459,12 @@ main (int argc, } g_free (app_icon); + } else if (profile_directory) { + /* This mode exists purely for letting EphyShell know it should + * not consider this instance part of the unique application + * represented by the BROWSER mode. + */ + mode = EPHY_EMBED_SHELL_MODE_STANDALONE; } else { mode = EPHY_EMBED_SHELL_MODE_BROWSER; -- cgit v1.2.3