From f6bc65bbd1a5b5523ec00fd05a62d921d8f07fc9 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 27 Nov 2011 13:42:13 +0100 Subject: [PATCH] fall back to Volume{Up,Down} if {Prev,Next}Column would do nothing --- src/ncmpcpp.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index 23e26d79..d81ea3dc 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -618,7 +618,8 @@ int main(int argc, char **argv) } else if (Keypressed(input, Key.PrevColumn) && SwitchToPrevColumn(myScreen)) { } else if (Keypressed(input, Key.NextColumn) && SwitchToNextColumn(myScreen)) { } - else if (Keypressed(input, Key.PrevColumn) && myLockedScreen && myInactiveScreen && myScreen->isMergable()) + else if (Keypressed(input, Key.PrevColumn) && myLockedScreen && myInactiveScreen + && myLockedScreen != myScreen && myScreen->isMergable()) { if (myScreen != myLockedScreen) { @@ -627,7 +628,8 @@ int main(int argc, char **argv) RedrawHeader = 1; } } - else if (Keypressed(input, Key.NextColumn) && myLockedScreen && myInactiveScreen && myScreen->isMergable()) + else if (Keypressed(input, Key.NextColumn) && myLockedScreen && myInactiveScreen + && myLockedScreen == myScreen && myScreen->isMergable()) { if (myScreen == myLockedScreen) {