[Performous-commit] Markus Raab : only add songs for which the sing screen was left

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

Module: performous
Branch: master
Commit: 92ab087792e53497396e80127a14b021e95721e3

Author: Markus Raab <un...@ma...>
Date:   Thu Nov 12 13:42:38 2009 +0100

only add songs for which the sing screen was left

thanks Yoda for the idea

---

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

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index ade25f7..f6c46ac 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -138,6 +138,7 @@ void ScreenSing::activateNextScreen()
 {
 	ScreenManager* sm = ScreenManager::getSingletonPtr();
 
+	m_database.addSong(m_song);
 	if (m_database.scores.empty()
 	      || !m_database.reachedHiscore(m_song))
 	{
diff --git a/game/songs.cc b/game/songs.cc
index c4e13d7..3b63876 100644
--- a/game/songs.cc
+++ b/game/songs.cc
@@ -72,7 +72,6 @@ void Songs::reload_internal(fs::path const& parent) {
 				boost::shared_ptr<Song>s(new Song(path, name));
 				s->randomIdx = ++randomIdx; // Not so random during loading, they are shuffled after load is finished
 				boost::mutex::scoped_lock l(m_mutex);
-				m_database.addSong(s);
 				m_songs.push_back(s);
 				m_dirty = true;
 			} catch (SongParserException& e) {