diff options
| -rw-r--r-- | DOCS/man/mpv.rst | 2 | ||||
| -rw-r--r-- | options/path.c | 1 | ||||
| -rw-r--r-- | osdep/path-win.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index 8b87c37285..92c0052c55 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -438,6 +438,8 @@ Name Meaning ``~~global/`` the global config path, if available (not on win32) ``~~osxbundle/`` the OSX bundle resource path (OSX only) ``~~desktop/`` the path to the desktop (win32, OSX) +``~~exe_dir`` win32 only: the path to the directory containing the exe (for + config file purposes; ``$MPV_HOME`` overrides it) ``~~old_home`` do not use ================ =============================================================== diff --git a/options/path.c b/options/path.c index 9c996ce664..7afa3c1dc0 100644 --- a/options/path.c +++ b/options/path.c @@ -59,6 +59,7 @@ static const char *const config_dirs[] = { "home", "old_home", "osxbundle", + "exe_dir" "global", }; diff --git a/osdep/path-win.c b/osdep/path-win.c index 8f289ff83a..78e83c2222 100644 --- a/osdep/path-win.c +++ b/osdep/path-win.c @@ -90,7 +90,7 @@ const char *mp_get_platform_path_win(void *talloc_ctx, const char *type) } else { if (strcmp(type, "home") == 0) return mp_get_win_app_dir(talloc_ctx); - if (strcmp(type, "old_home") == 0) + if (strcmp(type, "exe_dir") == 0) return mp_get_win_exe_dir(talloc_ctx); // Not really true, but serves as a way to return a lowest-priority dir. if (strcmp(type, "global") == 0) |