aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-01-06 16:37:27 +0800
committerMilan Crha <mcrha@redhat.com>2012-01-06 16:37:27 +0800
commit0a016671ee2b5004df4fd2bca80f0e34e68476c3 (patch)
tree5e345a863a2b4e5ea7e55a08e89345edc32a750a
parent86f4b5049a1e7261a2dc50738e2a6544eef475bd (diff)
downloadgsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.tar
gsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.tar.gz
gsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.tar.bz2
gsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.tar.lz
gsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.tar.xz
gsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.tar.zst
gsoc2013-evolution-0a016671ee2b5004df4fd2bca80f0e34e68476c3.zip
Do not call gtk_main_quit() on shell quit when none is running
-rw-r--r--shell/e-shell.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 32c43ffd05..dd0f4db19a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -413,7 +413,8 @@ shell_ready_for_quit (EShell *shell,
g_list_foreach (list, (GFunc) gtk_widget_destroy, NULL);
g_list_free (list);
- gtk_main_quit ();
+ if (gtk_main_level () > 0)
+ gtk_main_quit ();
}
static void