aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-09-01 02:41:22 +0800
committerXan Lopez <xan@igalia.com>2012-09-01 02:41:22 +0800
commit195bb27b6c0f710f1d7faff452de71dbb07a9604 (patch)
treee947c6ff719bde9a75d0ae4f734be3bda0a9a7f9
parentf930456a362922ea87f0c86344546707847682d2 (diff)
downloadgsoc2013-epiphany-195bb27b6c0f710f1d7faff452de71dbb07a9604.tar.gz
gsoc2013-epiphany-195bb27b6c0f710f1d7faff452de71dbb07a9604.tar.zst
gsoc2013-epiphany-195bb27b6c0f710f1d7faff452de71dbb07a9604.zip
ephy-main: do not run the browser if the migrator fails
Lot's of nasty things could potentially happen.
-rw-r--r--src/ephy-main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c
index ea7be1b13..063c2f8fa 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -390,8 +390,13 @@ main (int argc,
g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
/* TODO: we want to migrate each WebApp profile too. */
- if (!private_instance && !application_mode)
- ephy_profile_utils_do_migration (-1, FALSE);
+ if (!private_instance && !application_mode) {
+ /* If the migration fails we don't really want to continue. */
+ if (!ephy_profile_utils_do_migration (-1, FALSE)) {
+ g_print ("Failed to run the migrator process, Web will now abort.");
+ exit (1);
+ }
+ }
/* Start our services */
flags = EPHY_FILE_HELPERS_ENSURE_EXISTS;