[packages/feh.git] / feh-git_fixes.patch

diff --git a/src/slideshow.c b/src/slideshow.c
index ba9e028..58992c3 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -170,18 +170,8 @@ void feh_reload_image(winwidget w, int resize, int force_new)
 	winwidget_free_image(w);
 
 	/* if the image has changed in dimensions - we gotta resize */
-	if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) {
-		if (force_new) {
-			eprintf("failed to reload image\n");
-		} else {
-			im_weprintf(w, "Couldn't reload image. Is it still there?");
-		}
-		winwidget_rename(w, title);
-		free(title);
-		free(new_title);
-		filelist = feh_file_remove_from_list(filelist, w->file);
-		return;
-	}
+	if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0)
+		eprintf("failed to reload image\n");
 
 	if (!resize && ((old_w != gib_imlib_image_get_width(tmp)) ||
 			(old_h != gib_imlib_image_get_height(tmp))))
Commit	Line	Data
6f517514 PG	1	diff --git a/src/slideshow.c b/src/slideshow.c
	2	index ba9e028..58992c3 100644
	3	--- a/src/slideshow.c
	4	+++ b/src/slideshow.c
	5	@@ -170,18 +170,8 @@ void feh_reload_image(winwidget w, int resize, int force_new)
	6	winwidget_free_image(w);
	7
	8	/* if the image has changed in dimensions - we gotta resize */
	9	- if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) {
	10	- if (force_new) {
	11	- eprintf("failed to reload image\n");
	12	- } else {
	13	- im_weprintf(w, "Couldn't reload image. Is it still there?");
	14	- }
	15	- winwidget_rename(w, title);
	16	- free(title);
	17	- free(new_title);
	18	- filelist = feh_file_remove_from_list(filelist, w->file);
	19	- return;
	20	- }
	21	+ if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0)
	22	+ eprintf("failed to reload image\n");
	23
	24	if (!resize && ((old_w != gib_imlib_image_get_width(tmp)) \|\|
	25	(old_h != gib_imlib_image_get_height(tmp))))