diff options
author | elevengu <enhasa@live.com> | 2014-02-12 18:54:54 -0500 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-02-14 21:55:04 +0100 |
commit | 792c1750ecb7af83b52feaee387728d48772b34b (patch) | |
tree | cc90ad4bacee16e747698163d597899bfd32dfe5 /osdep/path-win.c | |
parent | cf6d6666e2dbfaf285a88e85b93b59cf0e0c1385 (diff) | |
download | mpv-792c1750ecb7af83b52feaee387728d48772b34b.tar.bz2 mpv-792c1750ecb7af83b52feaee387728d48772b34b.tar.xz |
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 <wm4@nowhere>
Merges/closes #543.
Diffstat (limited to 'osdep/path-win.c')
-rw-r--r-- | osdep/path-win.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; + } } } |