[Performous-commit] Miguel Sánchez de León Peque : When both text and type filter are activated in screen_songs, first CANCEL just clear text filter.

[Peque <ms...@us...>]

Module: performous
Branch: master
Commit: 28d119d81a450ac02c35af171d45a1e2a207d579

Author: Miguel Sánchez de León Peque <mi...@vo...>
Date:   Wed Jan 27 17:13:27 2010 +0100

When both text and type filter are activated in screen_songs, first CANCEL just clear text filter.

---

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

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 3f5c619..ea62d4f 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -74,8 +74,9 @@ void ScreenSongs::manageEvent(SDL_Event event) {
 			else manageSharedKey(nav);
 			return;
 		} else if (nav == input::CANCEL) {
-			if (m_search.text.empty() && m_songs.getTypeFilter() == 0) sm->activateScreen("Intro");
-			else { m_search.text.clear(); m_songs.setFilter(m_search.text); m_songs.setTypeFilter(0); }
+			if (!m_search.text.empty()) { m_search.text.clear(); m_songs.setFilter(m_search.text); }
+			else if (m_songs.getTypeFilter() != 0) m_songs.setTypeFilter(0);
+			else sm->activateScreen("Intro");
 		}
 		// The rest are only available when there are songs available
 		else if (m_songs.empty()) return;