[Performous-commit] Markus Raab : optimize deactivation

[Markus R. <god...@us...>]

Module: performous
Branch: hiscore
Commit: 82595126294551b772ac38d3842f9733163c5ca1

Author: Markus Raab <un...@ma...>
Date:   Wed Jul 29 12:24:41 2009 +0200

optimize deactivation

---

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

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 09161f8..5ec8717 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -63,6 +63,13 @@ void ScreenSing::activatePlayerScreen()
 {
 	ScreenManager* sm = ScreenManager::getSingletonPtr();
 
+	if (!config["game/song_hiscore"].b())
+	{
+		// user does not want a per song highscore
+		sm->activateScreen("Songs");
+		return;
+	}
+
 	// TODO: multiple loading...
 	// TODO: make it possible to switch of highscore through configuration
 	SongHiscore hi(m_song->path, "High.sco");
@@ -74,8 +81,7 @@ void ScreenSing::activatePlayerScreen()
 
 	if (m_players.scores.empty()
 	      || !hi.reachedNewHiscore(m_players.scores.front())
-	      || !hi.isWritable()
-	      || !config["game/song_hiscore"].b())
+	      || !hi.isWritable())
 	{
 		// if no highscore reached..
 		sm->activateScreen("Songs");