From 06d7bcf3dceacfc8b56be2e3f209daa98e2cf248 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Tue, 23 Aug 2005 12:32:36 +0000 Subject: [PATCH] 2005-08-23 [paul] 1.9.13cvs54 * src/main.c fix crash recovery Patch by Colin --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/main.c | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 260403164..fc23f02b9 100644 --- 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 67e412ac6..1e632789b 100644 --- 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 a5eee9b1f..f17860908 100644 --- 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 f7794e881..e51765470 100644 --- 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(); -- 2.25.1