Mercurial > geeqie
changeset 891:841b387dd877
fixed test for changed files in cache
| author | nadvornik |
|---|---|
| date | Fri, 18 Jul 2008 21:20:49 +0000 |
| parents | bc9df0fecdc1 |
| children | 2022112583d0 |
| files | src/filecache.c src/image.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/filecache.c Fri Jul 18 09:55:15 2008 +0000 +++ b/src/filecache.c Fri Jul 18 21:20:49 2008 +0000 @@ -66,8 +66,8 @@ fc->list = g_list_remove_link(fc->list, work); fc->list = g_list_concat(work, fc->list); -// if (file_data_check_changed_files(fd)) /* this will eventually remove changed files from cache via file_cache_notify_cb */ -// return FALSE; + if (file_data_check_changed_files(fd)) /* this will eventually remove changed files from cache via file_cache_notify_cb */ + return FALSE; if (debug_file_cache) file_cache_dump(fc); return TRUE;
--- a/src/image.c Fri Jul 18 09:55:15 2008 +0000 +++ b/src/image.c Fri Jul 18 21:20:49 2008 +0000 @@ -1356,7 +1356,9 @@ ImageWindow *imd = data; if (!imd || !image_get_pixbuf(imd) || - imd->il || !imd->image_fd || + /* imd->il || */ /* loading in progress - do not check - it should start from the beginning anyway */ + !imd->image_fd || /* nothing to reload */ + imd->state == IMAGE_STATE_NONE || /* loading not started, no need to reload */ !options->update_on_time_change) return; if (type == NOTIFY_TYPE_REREAD && fd == imd->image_fd)