2005-08-23 [paul] 1.9.13cvs54

	* src/main.c
		fix crash recovery
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 26040316458d654307ce5e1d6814b62de06ba153..fc23f02b990a1fcdb6a8662b606b346a56f4a813 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-08-23 [paul]      1.9.13cvs54
+
+       * src/main.c
+               fix crash recovery
+               Patch by Colin
+
 2005-08-23 [paul]      1.9.13cvs53
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 67e412ac618c815c028ec84bd84fb2e633839f5a..1e632789b53c27eb1944dcf2509bc401aff4517f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -739,3 +739,4 @@
 ( cvs diff -u -r 1.207.2.57 -r 1.207.2.58 src/folderview.c;  cvs diff -u -r 1.52.2.11 -r 1.52.2.12 src/prefs_folder_item.c;  ) > 1.9.13cvs51.patchset
 ( cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/addressbook.c;  ) > 1.9.13cvs52.patchset
 ( cvs diff -u -r 1.60.2.27 -r 1.60.2.28 src/addressbook.c;  cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/editaddress.c;  ) > 1.9.13cvs53.patchset
+( cvs diff -u -r 1.115.2.50 -r 1.115.2.51 src/main.c;  ) > 1.9.13cvs54.patchset

diff --git a/configure.ac b/configure.ac
index a5eee9b1ff245043877b8a460cc343b82cd0f22d..f1786090807b201bf0cd4b6ef694d7045261b304 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index f7794e8816587a7618b9f95c5808b2708b302ce9..e517654706449ea871de5e6a6d8f3f1aa46bef24 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -234,6 +234,7 @@ int main(int argc, char *argv[])
        MainWindow *mainwin;
        FolderView *folderview;
        GdkPixbuf *icon;
+       gboolean crash_file_present = FALSE;
 
        if (!sylpheed_init(&argc, &argv)) {
                return 0;
@@ -318,6 +319,7 @@ int main(int argc, char *argv[])
        MAKE_DIR_IF_NOT_EXIST(get_tmp_dir());
        MAKE_DIR_IF_NOT_EXIST(RC_DIR G_DIR_SEPARATOR_S "uidl");
 
+       crash_file_present = is_file_exist(get_crashfile_name());
        /* remove temporary files */
        remove_all_files(get_tmp_dir());
        remove_all_files(get_mime_tmp_dir());
@@ -415,7 +417,7 @@ int main(int argc, char *argv[])
        main_window_cursor_normal(mainwin);
 
        /* if Sylpheed crashed, rebuild caches */
-       if (!cmd.crash && is_file_exist(get_crashfile_name())) {
+       if (!cmd.crash && crash_file_present) {
                debug_print("Sylpheed crashed, checking for new messages in local folders\n");
                folderview_check_new(NULL);
                folder_clean_cache_memory_force();