aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/startup-wizard/evolution-startup-wizard.c13
1 files 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);