diff options
| author | James Ross-Gowan <rossymiles@gmail.com> | 2014-09-05 23:09:12 +1000 |
|---|---|---|
| committer | Alessandro Ghedini <alessandro@ghedini.me> | 2014-09-05 21:16:53 +0200 |
| commit | 0ba2da8a76850544ad3a0d23927bbee32d180dd6 (patch) | |
| tree | 6b0d05374389ca1bf768b7aac58d7ce64eedd8f3 | |
| parent | 1871f2a703d5863d9839427a6c9de9d0cf281846 (diff) | |
| download | mpv-0ba2da8a76850544ad3a0d23927bbee32d180dd6.tar.bz2 mpv-0ba2da8a76850544ad3a0d23927bbee32d180dd6.tar.xz | |
player: check for null in resume config search
Signed-off-by: wm4 <wm4@nowhere>
CC: @mpv-player/stable
| -rw-r--r-- | player/configfiles.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/player/configfiles.c b/player/configfiles.c index d1c79c9c9d..92f2c079ea 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -200,7 +200,8 @@ static char *mp_get_playback_resume_config_filename(struct mpv_global *global, if (!res) { res = mp_find_config_file(tmp, global, MP_WATCH_LATER_CONF); - res = talloc_asprintf(NULL, "%s/%s", res, conf); + if (res) + res = talloc_asprintf(NULL, "%s/%s", res, conf); } exit: |