diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2014-02-15 19:44:58 -0300 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2014-02-15 19:44:58 -0300 |
| commit | 317a02bdd43ee4d650e4faea340c610fdfa82ff5 (patch) | |
| tree | 97713668edc7117395f6a5a25e0c554786898b11 /osdep | |
| parent | 4a66fce7d336e96847acf5f54e7c0aa30f31ff3b (diff) | |
| parent | 792c1750ecb7af83b52feaee387728d48772b34b (diff) | |
| download | mpv-317a02bdd43ee4d650e4faea340c610fdfa82ff5.tar.bz2 mpv-317a02bdd43ee4d650e4faea340c610fdfa82ff5.tar.xz | |
Merge branch 'master' of git://github.com/mpv-player/mpv
* 'master' of git://github.com/mpv-player/mpv:
win32: restore support for exe directory as config directory
crosscompile-mingw: improve instructions for MXE
sd_lavc: handle subtitles with no subtitle resolution set
options: make --no-config block all auto-loaded configuration files
lua: auto-load scripts from ~/.mpv/lua/
lua: make register_event() not overwrite previous event handler
Diffstat (limited to 'osdep')
| -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; + } } } |