Commit d1f218ca authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

imlib.c: When opening via URL, always use URL as filename

parent 503048c6
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,8 @@ git HEAD
    ** %o    x,y image offset relative to top-left window corner
    ** %o    x,y image offset relative to top-left window corner
    ** %r    image rotation
    ** %r    image rotation
    ** %z    image zoom
    ** %z    image zoom
    * Always use file URL as filename when opening http files.
      (consequence: lossless rotate no longer works for such files)


Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>
Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>


+1 −8
Original line number Original line Diff line number Diff line
@@ -171,14 +171,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file)
			file->ed = exif_get_data(tmpname);
			file->ed = exif_get_data(tmpname);
#endif
#endif
		}
		}
		if ((opt.slideshow) && (opt.reload == 0) && (image_source != SRC_MAGICK)) {
		if ((image_source == SRC_MAGICK) || !opt.keep_http)
			free(file->filename);
			file->filename = estrdup(tmpname);

			if (!opt.keep_http)
				add_file_to_rm_filelist(tmpname);
		}
		else if ((image_source == SRC_MAGICK) || !opt.keep_http)
			unlink(tmpname);
			unlink(tmpname);


		free(tmpname);
		free(tmpname);