summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2014-09-05 23:09:12 +1000
committerwm4 <wm4@nowhere>2014-09-05 17:51:45 +0200
commiteba8eeda78aa2e90fb38e8042194e7b1040cae49 (patch)
treeac29a1f995f858f7063e885fa44483882921f5f7 /player
parent5c3f3fd3dab3e399c473790f55272c5d6aec2764 (diff)
downloadmpv-eba8eeda78aa2e90fb38e8042194e7b1040cae49.tar.bz2
mpv-eba8eeda78aa2e90fb38e8042194e7b1040cae49.tar.xz
player: check for null in resume config search
Signed-off-by: wm4 <wm4@nowhere> CC: @mpv-player/stable
Diffstat (limited to 'player')
-rw-r--r--player/configfiles.c3
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: