From 717cdeb95da654f812bf7ee8e228e53ea3284ab4 Mon Sep 17 00:00:00 2001 From: elevengu Date: Wed, 12 Feb 2014 18:54:54 -0500 Subject: win32: restore support for exe directory as config directory Same rationale as b2c2fe7a but updated to work with path-win.c Signed-off-by: wm4 Merges/closes #543. --- osdep/path-win.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osdep/path-win.c b/osdep/path-win.c index d89adc755e..2b1e8b5144 100644 --- a/osdep/path-win.c +++ b/osdep/path-win.c @@ -59,7 +59,11 @@ char *mp_get_win_config_path(const char *filename) res = mp_path_join(NULL, bstr0(temp), bstr0(filename)); if (!mp_path_exists(res) || mp_path_isdir(res)) { talloc_free(res); - res = NULL; + res = mp_path_join(NULL, bstr0(dir), bstr0(filename)); + if (!mp_path_exists(res) || mp_path_isdir(res)) { + talloc_free(res); + res = NULL; + } } } -- cgit v1.2.3