fix issues with setting myInactiveScreen to improper value

like playlist (run as subwindow) overwriting song info screen
after 5 seconds when its highlighting was disabled.
master
Andrzej Rybczak 15 years ago
parent a88bc90d58
commit df62a28c72
  1. 4
      src/screen.cpp

@ -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;

Loading…
Cancel
Save