changeset 1731:155268f3bc76

do not reload image on copy, move, rename and external editor changed files should be detected anyway http://sourceforge.net/tracker/index.php?func=detail&aid=2848373&group_id=222125&atid=1054680
author nadvornik
date Thu, 03 Sep 2009 19:18:20 +0000
parents 67145eade000
children a2dc83823432
files src/image.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/image.c	Fri Aug 28 23:09:05 2009 +0000
+++ b/src/image.c	Thu Sep 03 19:18:20 2009 +0000
@@ -1440,10 +1440,12 @@
 	    imd->state == IMAGE_STATE_NONE /* loading not started, no need to reload */
 	    ) return;
 
-	if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE)) && fd == imd->image_fd)
+	if ((type & NOTIFY_REREAD) && fd == imd->image_fd)
 		{
-		if ((type & NOTIFY_CHANGE) && fd->change && fd->change->type == FILEDATA_CHANGE_DELETE)
-			return; /* keep the image displayed, it will be replaced by the next image from the list soon */
+		/* there is no need to reload on NOTIFY_CHANGE, 
+		   modified files should be detacted anyway and NOTIFY_REREAD should be recieved 
+		   or they are removed from the filelist completely on "move" and "delete"
+		*/
 		DEBUG_1("Notify image: %s %04x", fd->path, type);
 		image_reload(imd);
 		}