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

fixes for overwriting not mergable screen displayed on top of merged ones

Browse Source
This commit is contained in:
Andrzej Rybczak
2011-11-19 20:07:51 +01:00
parent df62a28c72
commit 4a8cfcb187
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/screen.cpp
View File

@@ -29,7 +29,7 @@ using Global::myInactiveScreen;
void ApplyToVisibleWindows(void (BasicScreen::*f)())
{
if (myLockedScreen)
if (myLockedScreen && myScreen->isMergable())
{
if (myScreen == myLockedScreen)
{
@@ -51,7 +51,7 @@ bool isVisible(BasicScreen *screen)
{
assert(screen != 0);
if (myLockedScreen && myScreen->isMergable())
return screen == myScreen || screen == myInactiveScreen || screen == myLockedScreen;
return screen == myInactiveScreen || screen == myLockedScreen;
else
return screen == myScreen;
}