diff options
| author | Philip Langdale <philipl@overt.org> | 2020-10-14 20:02:58 -0700 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2020-10-16 00:47:18 +0300 |
| commit | 949e06c86c332d46efed97704fa170a5ad11b830 (patch) | |
| tree | d52196eae8f1372d4a3e0394d40b798ec54087f4 /osdep | |
| parent | aa18a8e1cde663caeabd93af7d57a745c1a76af6 (diff) | |
| download | mpv-949e06c86c332d46efed97704fa170a5ad11b830.tar.bz2 mpv-949e06c86c332d46efed97704fa170a5ad11b830.tar.xz | |
Revert "path: switch back to using non-XDG config dir by default"
This reverts commit 269f0e743e5634691f0c9d5b1b8a4bb68eedbbd0.
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/path-unix.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/osdep/path-unix.c b/osdep/path-unix.c index 4a79a1838e..d9a49ab06d 100644 --- a/osdep/path-unix.c +++ b/osdep/path-unix.c @@ -33,17 +33,17 @@ static void path_init(void) char *home = getenv("HOME"); char *xdg_dir = getenv("XDG_CONFIG_HOME"); - if (home && home[0]) - snprintf(mpv_home, sizeof(mpv_home), "%s/.mpv", home); - - // Maintain compatibility with old XDG config dirs if (xdg_dir && xdg_dir[0]) { - snprintf(old_home, sizeof(old_home), "%s/mpv", xdg_dir); + snprintf(mpv_home, sizeof(mpv_home), "%s/mpv", xdg_dir); } else if (home && home[0]) { - snprintf(old_home, sizeof(old_home), "%s/.config/mpv", home); + snprintf(mpv_home, sizeof(mpv_home), "%s/.config/mpv", home); } - // If the compat. dir exists, and the proper dir doesn't, use the compat. + // Maintain compatibility with old ~/.mpv + if (home && home[0]) + snprintf(old_home, sizeof(old_home), "%s/.mpv", home); + + // If the old ~/.mpv exists, and the XDG config dir doesn't, use the old // config dir only. if (mp_path_exists(old_home) && !mp_path_exists(mpv_home)) { snprintf(mpv_home, sizeof(mpv_home), "%s", old_home); |