feh_file_info_preload: free feh_file data structure when removing list items

Conflicts:
	ChangeLog

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 932adb1..fc5efa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+git HEAD
+
+    * Handle missing HOME in environment
+    * Fix memory leak when a slideshow contains many unloadable images
+    * Fix memory leak when --prelaod removes files from the filelist
+
 Thu, 15 May 2014 23:41:07 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
-* Releasev v2.12
+* Release v2.12
     * feh-cam and gen-cam-menu are no longer installed by default. Use
       'make install cam=1' to install them or 'make uninstall cam=1 && make
       install cam=0' to remove them permanently
diff --git a/src/filelist.c b/src/filelist.c
index b1a369a..d8aa1e3 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -332,8 +332,10 @@ gib_list *feh_file_info_preload(gib_list * list)
 		feh_display_status(0);
 
 	if (remove_list) {
-		for (l = remove_list; l; l = l->next)
+		for (l = remove_list; l; l = l->next) {
+			feh_file_free(FEH_FILE(((gib_list *) l->data)->data));
 			filelist = list = gib_list_remove(list, (gib_list *) l->data);
+		}
 
 		gib_list_free(remove_list);
 	}