diff options
| author | Ben Boeckel <mathstuf@gmail.com> | 2014-08-27 18:16:03 -0400 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-08-28 12:02:41 +0200 |
| commit | 9780ff96427d6d68ce6e13a7c02fad14192f00a3 (patch) | |
| tree | 2fe02299de039fd441a399c1901ad5b53a90abb9 | |
| parent | e0235244812c011b9d0cc589c27ee65e5223bec6 (diff) | |
| download | mpv-9780ff96427d6d68ce6e13a7c02fad14192f00a3.tar.bz2 mpv-9780ff96427d6d68ce6e13a7c02fad14192f00a3.tar.xz | |
player: simplify chapter display name code
The display name is always recomputed, so we can always toss the input
name.
| -rw-r--r-- | player/playloop.c | 5 |
1 files 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; } |