Main: allow playlist directory without music directory

This commit is contained in:
Max Kellermann 2014-02-07 22:39:17 +01:00
parent 04d5896c1c
commit 5e4dd4be9c
2 changed files with 2 additions and 4 deletions

1
NEWS
View File

@ -27,6 +27,7 @@ ver 0.19 (not yet released)
- increase kernel timer slack on Linux - increase kernel timer slack on Linux
- name each thread (for debugging) - name each thread (for debugging)
* new resampler option using libsoxr * new resampler option using libsoxr
* allow playlist directory without music directory
ver 0.18.8 (2014/02/07) ver 0.18.8 (2014/02/07)
* decoder * decoder

View File

@ -142,11 +142,8 @@ glue_mapper_init(Error &error)
if (playlist_dir.IsNull() && error.IsDefined()) if (playlist_dir.IsNull() && error.IsDefined())
return false; return false;
if (music_dir.IsNull()) {
music_dir = GetUserMusicDir();
if (music_dir.IsNull()) if (music_dir.IsNull())
return true; music_dir = GetUserMusicDir();
}
mapper_init(std::move(music_dir), std::move(playlist_dir)); mapper_init(std::move(music_dir), std::move(playlist_dir));
return true; return true;