Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actions: consider jumping to parent dir runnable even on root level

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-05 23:03:45 +02:00
parent 3d2e61f188
commit 8ef252ec6e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/actions.cpp
View File

@@ -639,9 +639,9 @@ void ToggleInterface::Run()
bool JumpToParentDir::canBeRun() const bool JumpToParentDir::canBeRun() const
{ {
return (myScreen == myBrowser && myBrowser->CurrentDir() != "/") return (myScreen == myBrowser)
# ifdef HAVE_TAGLIB_H # ifdef HAVE_TAGLIB_H
|| (myScreen->ActiveWindow() == myTagEditor->Dirs && myTagEditor->CurrentDir() != "/") || (myScreen->ActiveWindow() == myTagEditor->Dirs)
# endif // HAVE_TAGLIB_H # endif // HAVE_TAGLIB_H
; ;
} }
@@ -650,14 +650,20 @@ void JumpToParentDir::Run()
{ {
if (myScreen == myBrowser) if (myScreen == myBrowser)
{ {
myBrowser->Main()->reset(); if (myBrowser->CurrentDir() != "/")
myBrowser->EnterPressed(); {
myBrowser->Main()->reset();
myBrowser->EnterPressed();
}
} }
# ifdef HAVE_TAGLIB_H # ifdef HAVE_TAGLIB_H
else if (myScreen == myTagEditor) else if (myScreen == myTagEditor)
{ {
myTagEditor->Dirs->reset(); if (myTagEditor->CurrentDir() != "/")
myTagEditor->EnterPressed(); {
myTagEditor->Dirs->reset();
myTagEditor->EnterPressed();
}
} }
# endif // HAVE_TAGLIB_H # endif // HAVE_TAGLIB_H
} }