talons

commit b9aa34f275e044e63d5053fe72ab48e832cacf19
parent 55aee5c03b84fbeaca9a09151f6a4aa4bcdc1492
Author: Colin Leroy <colin@colino.net>
Date:   Mon,  9 Jun 2008 16:45:17 +0000

2008-06-09 [colin]	3.4.0cvs84

	* src/main.c
		Fix bug 1447, 'If user tries to close while starting
		up, it will not close ever.'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
4
++++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09 [colin]	3.4.0cvs84
+
+	* src/main.c
+		Fix bug 1447, 'If user tries to close while starting 
+		up, it will not close ever.'
+
 2008-06-09 [colin]	3.4.0cvs83
 
 	* src/filtering.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3379,3 +3379,4 @@
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_message.c;  ) > 3.4.0cvs81.patchset
 ( cvs diff -u -r 1.94.2.179 -r 1.94.2.180 src/messageview.c;  ) > 3.4.0cvs82.patchset
 ( cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/filtering.c;  ) > 3.4.0cvs83.patchset
+( cvs diff -u -r 1.115.2.196 -r 1.115.2.197 src/main.c;  ) > 3.4.0cvs84.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=83
+EXTRA_VERSION=84
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -1891,6 +1891,10 @@ void app_will_exit(GtkWidget *widget, gpointer data)
 {
 	MainWindow *mainwin = data;
 	
+	if (gtk_main_level() == 0) {
+		debug_print("not even started\n");
+		return;
+	}
 	if (sc_exiting == TRUE) {
 		debug_print("exit pending\n");
 		return;