Fixes NB#137624, crash when creating a new folder in offline mode

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 796560e..31469d7 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -63,7 +63,8 @@ on_idle_exit_modest (gpointer data)
        gdk_threads_enter ();
        mail_op_queue = modest_runtime_get_mail_operation_queue ();
 
-       if (modest_mail_operation_queue_running_shutdown (mail_op_queue)) {
+       if (modest_tny_account_store_is_shutdown (modest_runtime_get_account_store ()) &&
+           modest_mail_operation_queue_running_shutdown (mail_op_queue)) {
 
                /* Disconnect signals. Will be freed by the destroy notify */
                handlers = (MainSignalHandlers *) data;
@@ -152,9 +153,10 @@ main (int argc, char *argv[])
        g_option_context_add_group (context, gtk_get_option_group (TRUE));
        if (!g_option_context_parse (context, &argc, &argv, &error)) {
                g_print ("option parsing failed: %s\n", error->message);
+               g_option_context_free (context);
                exit (1);
        }
-
+       g_option_context_free (context);
 
        show_ui_without_top_application_method = show_ui;