[Performous-commit] Tapio Vierros : Fix for score window displaying too early with instruments.

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

Module: performous
Branch: master
Commit: 966da19ec32ee48627d5a8836ba11d45e191931e

Author: Tapio Vierros <tap...@gm...>
Date:   Fri Nov 13 15:27:07 2009 +0200

Fix for score window displaying too early with instruments.

---

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

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 5f51a8f..3f52660 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -173,7 +173,7 @@ void ScreenSing::manageEvent(SDL_Event event) {
 		}
 		else if (key == SDLK_RETURN) {
 			if (m_score_window.get()) { activateNextScreen(); return; } // Score window visible -> Enter quits
-			else if (status == Song::FINISHED) m_score_window.reset(new ScoreWindow(*m_engine, m_database)); // Song finished, but no score window -> show it
+			else if (status == Song::FINISHED && m_song->track_map.empty()) m_score_window.reset(new ScoreWindow(*m_engine, m_database)); // Song finished, but no score window -> show it
 		}
 		else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
 		if (m_score_window.get()) return;