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

fix issues with setting myInactiveScreen to improper value

Browse Source 
like playlist (run as subwindow) overwriting song info screen
after 5 seconds when its highlighting was disabled.
This commit is contained in:
Andrzej Rybczak
2011-11-16 23:12:34 +01:00
parent a88bc90d58
commit df62a28c72
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/screen.cpp
View File

@@ -44,13 +44,13 @@ void ApplyToVisibleWindows(void (BasicScreen::*f)())
void UpdateInactiveScreen(BasicScreen *screen)
{
myInactiveScreen = myLockedScreen == screen ? 0 : myScreen;
myInactiveScreen = myLockedScreen == screen ? 0 : myLockedScreen;
}
bool isVisible(BasicScreen *screen)
{
assert(screen != 0);
if (myLockedScreen)
if (myLockedScreen && myScreen->isMergable())
return screen == myScreen || screen == myInactiveScreen || screen == myLockedScreen;
else
return screen == myScreen;