From 5270b3042f2f5b3e122d7c2ac4f365109458dd19 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 26 Aug 2010 16:22:47 +0200 Subject: Crash on Startup wizard cancel As reported in Red Hat bugzilla in 626810 --- modules/startup-wizard/evolution-startup-wizard.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 1b9cbcd9b0..e1b8551574 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -185,10 +185,15 @@ startup_wizard_config_abort (EConfig *config, g_assert_not_reached (); } - e_import_cancel ( - extension->import, - extension->import_target, - extension->import_importer); + if (extension->import_importer) { + e_import_cancel ( + extension->import, + extension->import_target, + extension->import_importer); + } else { + startup_wizard_terminate (); + g_assert_not_reached (); + } extension->import_cancelled = TRUE; e_config_target_changed (config, E_CONFIG_TARGET_CHANGED_STATE); -- cgit