diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-08-26 22:22:47 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-08-26 22:24:46 +0800 |
| commit | 5270b3042f2f5b3e122d7c2ac4f365109458dd19 (patch) | |
| tree | 97b98768903ff226d25b5c8ff6ba3199c7883afc | |
| parent | fe285c11164c5f7700bc32243fba6efbc0a2c5b1 (diff) | |
| download | gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.tar gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.tar.gz gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.tar.bz2 gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.tar.lz gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.tar.xz gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.tar.zst gsoc2013-evolution-5270b3042f2f5b3e122d7c2ac4f365109458dd19.zip | |
Crash on Startup wizard cancel
As reported in Red Hat bugzilla in 626810
| -rw-r--r-- | modules/startup-wizard/evolution-startup-wizard.c | 13 |
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); |