X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-main.c;h=31469d7e7849a5105437799a89d133378a265f98;hb=b2820dc1b13a08ff616aaf842c5f451353df0f38;hp=796560e1034ed55264f6ee758d743173d3c9ff99;hpb=8ef67be83b1b65ad112585d7e1ecefd8beb46b69;p=modest

diff --git a/src/modest-main.c b/src/modest-main.c
index 796560e..31469d7 100644
--- 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;