From fc9b1deb56fb26e79788ba97193097923a883a84 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 12 Mar 2011 23:38:24 +0100 Subject: Fix segfault upon unloadable image with --title %h/%w/... (closes GH-35) --- src/slideshow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/slideshow.c b/src/slideshow.c index 5ceee39..a75affd 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -252,10 +252,6 @@ void slideshow_change_image(winwidget winwid, int change) filelist = feh_file_remove_from_list(filelist, last); last = NULL; } - s = slideshow_create_name(FEH_FILE(current_file->data)); - - winwidget_rename(winwid, s); - free(s); if ((winwidget_loadimage(winwid, FEH_FILE(current_file->data))) != 0) { @@ -269,6 +265,11 @@ void slideshow_change_image(winwidget winwid, int change) winwid->im_w = gib_imlib_image_get_width(winwid->im); winwid->im_h = gib_imlib_image_get_height(winwid->im); winwidget_render_image(winwid, 1, 1); + + s = slideshow_create_name(FEH_FILE(current_file->data)); + winwidget_rename(winwid, s); + free(s); + break; } else last = current_file; -- cgit v1.2.3