summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-01-19 19:56:33 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-01-19 19:56:33 +0100
commit325839b424421a0324d9e1687e512ff63c84c540 (patch)
tree793cd7a8d3886cb49e12c9f37ae1890533c8db2c
parent886bea1e034c6878f4466a7e427302351281043e (diff)
parentc8a4e7daa32b6fccd58a64bdad32773a055f8811 (diff)
Merge branch 'ulteq-reduced-startup-time'
-rw-r--r--src/slideshow.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/slideshow.c b/src/slideshow.c
index db389d5..80fa918 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -35,9 +35,7 @@ void init_slideshow_mode(void)
{
winwidget w = NULL;
int success = 0;
- char *s = NULL;
gib_list *l = filelist, *last = NULL;
- feh_file *file = NULL;
for (; l && opt.start_list_at; l = l->next) {
if (!strcmp(opt.start_list_at, FEH_FILE(l->data)->filename)) {
@@ -52,15 +50,12 @@ void init_slideshow_mode(void)
mode = "slideshow";
for (; l; l = l->next) {
- file = FEH_FILE(l->data);
if (last) {
filelist = feh_file_remove_from_list(filelist, last);
last = NULL;
}
current_file = l;
- s = slideshow_create_name(file, NULL);
- if ((w = winwidget_create_from_file(l, s, WIN_TYPE_SLIDESHOW)) != NULL) {
- free(s);
+ if ((w = winwidget_create_from_file(l, NULL, WIN_TYPE_SLIDESHOW)) != NULL) {
success = 1;
winwidget_show(w);
if (opt.slideshow_delay > 0.0)
@@ -69,7 +64,6 @@ void init_slideshow_mode(void)
feh_add_unique_timer(cb_reload_timer, w, opt.reload);
break;
} else {
- free(s);
last = l;
}
}