From 9780ff96427d6d68ce6e13a7c02fad14192f00a3 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 27 Aug 2014 18:16:03 -0400 Subject: player: simplify chapter display name code The display name is always recomputed, so we can always toss the input name. --- player/playloop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/player/playloop.c b/player/playloop.c index 9d6e007e40..dcbda59f13 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -434,7 +434,7 @@ int get_current_chapter(struct MPContext *mpctx) char *chapter_display_name(struct MPContext *mpctx, int chapter) { char *name = chapter_name(mpctx, chapter); - char *dname = name; + char *dname = NULL; if (name) { dname = talloc_asprintf(NULL, "(%d) %s", chapter + 1, name); } else if (chapter < -1) { @@ -447,8 +447,7 @@ char *chapter_display_name(struct MPContext *mpctx, int chapter) dname = talloc_asprintf(NULL, "(%d) of %d", chapter + 1, chapter_count); } - if (dname != name) - talloc_free(name); + talloc_free(name); return dname; } -- cgit v1.2.3