abstract shared parts of switchTo methods away

2012-09-15 22:27:50 +02:00
parent f7dba0a578
commit 14587cb4ec
46 changed files with 301 additions and 463 deletions
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -117,7 +117,8 @@ void BasicScreen::unlock()
 {
 	if (myInactiveScreen && myInactiveScreen != myLockedScreen)
 		myScreen = myInactiveScreen;
-	myLockedScreen->switchTo();
+	if (myScreen != myLockedScreen)
+		myLockedScreen->switchTo();
 	myLockedScreen = 0;
 	myInactiveScreen = 0;
 }