From 195bb27b6c0f710f1d7faff452de71dbb07a9604 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Fri, 31 Aug 2012 20:41:22 +0200 Subject: ephy-main: do not run the browser if the migrator fails Lot's of nasty things could potentially happen. --- src/ephy-main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/ephy-main.c') 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; -- cgit v1.2.3