From aa18a8e1cde663caeabd93af7d57a745c1a76af6 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Wed, 14 Oct 2020 20:02:45 -0700 Subject: Revert "path: do not use old_home for win32 exe dir" This reverts commit c3694f0acb7f71daac7606fafbadcb7b500ca35e. --- DOCS/man/mpv.rst | 2 -- options/path.c | 1 - osdep/path-win.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index 7b1c48c4a2..4cfb4d2979 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -438,8 +438,6 @@ 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 504adb7c84..9c996ce664 100644 --- a/options/path.c +++ b/options/path.c @@ -59,7 +59,6 @@ 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 78e83c2222..8f289ff83a 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, "exe_dir") == 0) + if (strcmp(type, "old_home") == 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) -- cgit v1.2.3