From 5f5d6bf03f10aba3147a470b72adf13f0dbf2fbc Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 24 May 2009 03:35:13 +0200 Subject: [PATCH] do not display message about disabled function if current item is parent dir --- src/ncmpcpp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index 8cc14ee6..669de687 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -522,11 +522,13 @@ int main(int argc, char *argv[]) ShowMessage("Deleting files is disabled by default, see man page for more details"); continue; } - if (item.type == itDirectory && (item.song || !Config.allow_physical_directories_deletion)) // [..] + if (item.type == itDirectory && !Config.allow_physical_directories_deletion) { ShowMessage("Deleting directories is disabled by default, see man page for more details"); continue; } + if (item.type == itDirectory && item.song) // parent dir + continue; LockStatusbar(); Statusbar() << "Delete " << (item.type == itSong ? "file" : "directory") << " \"" << (item.type == itSong ? item.song->GetName() : item.name) << "\" ? [y/n] ";