[Performous-commit] Tapio Vierros : Esc in ScoreWindow exits to players screen, not song browser.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: db25e4ffa8fa61fa1f0db911ca33d7031f60c2c1

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Nov 16 12:06:10 2009 +0200

Esc in ScoreWindow exits to players screen, not song browser.

---

 game/screen_sing.cc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index a1f5c15..a2ffde3 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -170,6 +170,8 @@ void ScreenSing::manageEvent(SDL_Event event) {
 		bool seekback = false;
 		int key = event.key.keysym.sym;
 		if (key == SDLK_ESCAPE || key == SDLK_q) {
+			// In ScoreWindow ESC goes to Players, otherwise insta-quit to Songs
+			if (m_score_window.get() && key == SDLK_ESCAPE) { activateNextScreen(); return; }
 			ScreenManager* sm = ScreenManager::getSingletonPtr();
 			sm->activateScreen("Songs");
 			return;