From 8ef252ec6ee841ae43cdfebbd66fc926558e1759 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 5 Sep 2012 23:03:45 +0200 Subject: [PATCH] actions: consider jumping to parent dir runnable even on root level --- src/actions.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/actions.cpp b/src/actions.cpp index 7e7e5a29..9f524b91 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -639,9 +639,9 @@ void ToggleInterface::Run() bool JumpToParentDir::canBeRun() const { - return (myScreen == myBrowser && myBrowser->CurrentDir() != "/") + return (myScreen == myBrowser) # ifdef HAVE_TAGLIB_H - || (myScreen->ActiveWindow() == myTagEditor->Dirs && myTagEditor->CurrentDir() != "/") + || (myScreen->ActiveWindow() == myTagEditor->Dirs) # endif // HAVE_TAGLIB_H ; } @@ -650,14 +650,20 @@ void JumpToParentDir::Run() { if (myScreen == myBrowser) { - myBrowser->Main()->reset(); - myBrowser->EnterPressed(); + if (myBrowser->CurrentDir() != "/") + { + myBrowser->Main()->reset(); + myBrowser->EnterPressed(); + } } # ifdef HAVE_TAGLIB_H else if (myScreen == myTagEditor) { - myTagEditor->Dirs->reset(); - myTagEditor->EnterPressed(); + if (myTagEditor->CurrentDir() != "/") + { + myTagEditor->Dirs->reset(); + myTagEditor->EnterPressed(); + } } # endif // HAVE_TAGLIB_H }