Revision: 1801
http://geeqie.svn.sourceforge.net/geeqie/?rev=1801&view=rev
Author: nadvornik
Date: 2009-07-24 12:56:54 +0000 (Fri, 24 Jul 2009)
Log Message:
-----------
do not try to reload deleted image
deleted image is replaced by the next one from the list, keep
the old image displayed until the new one is set
Modified Paths:
--------------
trunk/src/image.c
trunk/src/layout_image.c
Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c 2009-07-24 12:45:42 UTC (rev 1800)
+++ trunk/src/image.c 2009-07-24 12:56:54 UTC (rev 1801)
@@ -1442,6 +1442,8 @@
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE)) && 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 */
DEBUG_1("Notify image: %s %04x", fd->path, type);
image_reload(imd);
}
Modified: trunk/src/layout_image.c
===================================================================
--- trunk/src/layout_image.c 2009-07-24 12:45:42 UTC (rev 1800)
+++ trunk/src/layout_image.c 2009-07-24 12:56:54 UTC (rev 1801)
@@ -1879,9 +1879,11 @@
layout_image_set_collection(lw, cd, new);
return;
}
+ layout_image_set_fd(lw, NULL);
}
-
- layout_image_set_fd(lw, NULL);
+
+ /* the image will be set to the next image from the list soon,
+ setting it to NULL here is not necessary*/
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
