]>
Commit | Line | Data |
---|---|---|
4353b4e9 PG |
1 | --- ./src/slideshow.c.1 2011-09-01 12:18:59.303918828 +0200 |
2 | +++ ./src/slideshow.c 2011-08-16 22:53:06.000000000 +0200 | |
3 | @@ -149,7 +149,6 @@ void feh_reload_image(winwidget w, int r | |
4 | ||
5 | if (!w->file) { | |
6 | im_weprintf(w, "couldn't reload, this image has no file associated with it."); | |
7 | - winwidget_render_image(w, 0, 0); | |
8 | return; | |
9 | } | |
10 | ||
11 | @@ -167,17 +166,20 @@ void feh_reload_image(winwidget w, int r | |
12 | old_w = gib_imlib_image_get_width(w->im); | |
13 | old_h = gib_imlib_image_get_height(w->im); | |
14 | ||
15 | + /* force imlib2 not to cache */ | |
16 | + winwidget_free_image(w); | |
17 | + | |
18 | /* if the image has changed in dimensions - we gotta resize */ | |
19 | if ((feh_load_image(&tmp, FEH_FILE(w->file->data))) == 0) { | |
20 | if (force_new) { | |
21 | eprintf("failed to reload image\n"); | |
22 | } else { | |
23 | im_weprintf(w, "Couldn't reload image. Is it still there?"); | |
24 | - winwidget_render_image(w, 0, 0); | |
25 | } | |
26 | winwidget_rename(w, title); | |
27 | free(title); | |
28 | free(new_title); | |
29 | + filelist = feh_file_remove_from_list(filelist, w->file); | |
30 | return; | |
31 | } | |
32 | ||
33 | @@ -185,9 +187,6 @@ void feh_reload_image(winwidget w, int r | |
34 | (old_h != gib_imlib_image_get_height(tmp)))) | |
35 | resize = 1; | |
36 | ||
37 | - /* force imlib2 not to cache */ | |
38 | - winwidget_free_image(w); | |
39 | - | |
40 | w->im = tmp; | |
41 | winwidget_reset_image(w); | |
42 |