From 64e9c952f0bbd5c23fd775620f3df1c261799ed6 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 11 Aug 2011 20:30:06 +0200 Subject: Show correct file number after deleting image In the image_remove function, slideshow_change_image needs to be called before removing the image from the filelist. Because of this, the "x of y" displayed by --draw-filename is wrong (y is 1 too high). This commit introduces a new 'render' argument to slideshow_chingae_image. The image_remove function calls it with render=0, edits the filelist and then runs by winwidget_render_image itself. Patch by Yu-Jie Lin. --- src/menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/menu.c') diff --git a/src/menu.c b/src/menu.c index 7a70368..16e1c77 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1321,25 +1321,25 @@ void feh_menu_cb(feh_menu * m, feh_menu_item * i, int action, void *data) case CB_SORT_FILENAME: filelist = gib_list_sort(filelist, feh_cmp_filename); if (opt.jump_on_resort) { - slideshow_change_image(m->fehwin, SLIDE_FIRST); + slideshow_change_image(m->fehwin, SLIDE_FIRST, 1); } break; case CB_SORT_IMAGENAME: filelist = gib_list_sort(filelist, feh_cmp_name); if (opt.jump_on_resort) { - slideshow_change_image(m->fehwin, SLIDE_FIRST); + slideshow_change_image(m->fehwin, SLIDE_FIRST, 1); } break; case CB_SORT_FILESIZE: filelist = gib_list_sort(filelist, feh_cmp_size); if (opt.jump_on_resort) { - slideshow_change_image(m->fehwin, SLIDE_FIRST); + slideshow_change_image(m->fehwin, SLIDE_FIRST, 1); } break; case CB_SORT_RANDOMIZE: filelist = gib_list_randomize(filelist); if (opt.jump_on_resort) { - slideshow_change_image(m->fehwin, SLIDE_FIRST); + slideshow_change_image(m->fehwin, SLIDE_FIRST, 1); } break; case CB_FIT: -- cgit v1.2.3