From 5e4dd4be9c1f971f293e010b223500d5f941baf3 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 7 Feb 2014 22:39:17 +0100
Subject: [PATCH] Main: allow playlist directory without music directory
---
NEWS | 1 +
src/Main.cxx | 5 +----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 4547bc5c3..6dbf69390 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ ver 0.19 (not yet released)
- increase kernel timer slack on Linux
- name each thread (for debugging)
* new resampler option using libsoxr
+* allow playlist directory without music directory
ver 0.18.8 (2014/02/07)
* decoder
diff --git a/src/Main.cxx b/src/Main.cxx
index e2bcaf4ec..ebdecbb5d 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -142,11 +142,8 @@ glue_mapper_init(Error &error)
if (playlist_dir.IsNull() && error.IsDefined())
return false;
- if (music_dir.IsNull()) {
+ if (music_dir.IsNull())
music_dir = GetUserMusicDir();
- if (music_dir.IsNull())
- return true;
- }
mapper_init(std::move(music_dir), std::move(playlist_dir));
return true;