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

fall back to Volume{Up,Down} if {Prev,Next}Column would do nothing

Browse Source
This commit is contained in:
Andrzej Rybczak
2011-11-27 13:42:13 +01:00
parent fa298428d9
commit f6bc65bbd1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ncmpcpp.cpp
View File

@@ -618,7 +618,8 @@ int main(int argc, char **argv)
} }
else if (Keypressed(input, Key.PrevColumn) && SwitchToPrevColumn(myScreen)) { } else if (Keypressed(input, Key.PrevColumn) && SwitchToPrevColumn(myScreen)) { }
else if (Keypressed(input, Key.NextColumn) && SwitchToNextColumn(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) if (myScreen != myLockedScreen)
{ {
@@ -627,7 +628,8 @@ int main(int argc, char **argv)
RedrawHeader = 1; 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) if (myScreen == myLockedScreen)
{ {