2006-02-13 [cleroy] 2.0.0cvs47

	* src/mainwindow.c
		Fix exit crash

diff --git a/ChangeLog b/ChangeLog
index f7aab9b855c19496cc31d9661e3268d8894270f1..d87aa72b2a39d7e1d3860810a012521c470eb611 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-13 [cleroy]    2.0.0cvs47
+
+       * src/mainwindow.c
+               Fix exit crash
+
 2006-02-13 [wwp]       2.0.0cvs46
 
        * src/plugins/pgpcore/prefs_gpg.c

diff --git a/PATCHSETS b/PATCHSETS
index 28570a5e25a95870554d3eb2a4ad2e1da6f3f0ae..f9f81cdd11b747bce23dcc624f6523ba333a233b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1230,3 +1230,4 @@
 ( cvs diff -u -r 1.3.2.38 -r 1.3.2.39 src/prefs_themes.c;  ) > 2.0.0cvs44.patchset
 ( cvs diff -u -r 1.207.2.88 -r 1.207.2.89 src/folderview.c;  cvs diff -u -r 1.115.2.74 -r 1.115.2.75 src/main.c;  cvs diff -u -r 1.274.2.95 -r 1.274.2.96 src/mainwindow.c;  ) > 2.0.0cvs45.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.0.0cvs46.patchset
+( cvs diff -u -r 1.274.2.96 -r 1.274.2.97 src/mainwindow.c;  ) > 2.0.0cvs47.patchset

diff --git a/configure.ac b/configure.ac
index bd79b6f0336f0411a923a0ac74b5b3a92f411ee3..7a666a62d0a5709720716d02f66fd4bd64198565 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index feed330bff6b6f891b4418c1ff96527bd542c3cf..b11238afca5f03ce5e25b147f79e0af428929505 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1617,7 +1617,7 @@ void main_window_get_size(MainWindow *mainwin)
 {
        GtkAllocation *allocation;
 
-       if (mainwin->messageview == NULL) {
+       if (mainwin_list == NULL || mainwin->messageview == NULL) {
                debug_print("called after messageview "
                            "has been deallocated!\n");
                return;