From df62a28c72eb90a976e81dd00f2bbbc90967f66c Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Wed, 16 Nov 2011 23:12:34 +0100
Subject: [PATCH] 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.
---
 src/screen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/screen.cpp b/src/screen.cpp
index b25f5a80..6ce9a105 100644
--- a/src/screen.cpp
+++ b/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;