[Performous-commit] Vincent Le Ligeour : Fixed bug reported by Markus ( SDL key management problem)

[Yoda-JM <yo...@us...>]

Module: performous
Branch: 0.3
Commit: 5a82800e44a28a2abbd1cf7ffba92884b3136d33

Author: Vincent Le Ligeour <yo...@us...>
Date:   Fri Jul 24 10:06:56 2009 +0200

Fixed bug reported by Markus (SDL key management problem)

---

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

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index aac50e1..a939924 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -41,7 +41,7 @@ void ScreenSongs::manageEvent(SDL_Event event) {
 	SDLMod mod = event.key.keysym.mod;
 	if (m_jukebox) {
 		if (key == SDLK_ESCAPE || m_songs.empty()) m_jukebox = false;
-		else if (key == SDLK_SPACE || (key == SDLK_PAUSE || (key == SDLK_p && mod && KMOD_CTRL))) m_audio.togglePause();
+		else if (key == SDLK_SPACE || (key == SDLK_PAUSE || (key == SDLK_p && mod & KMOD_CTRL))) m_audio.togglePause();
 		else if (key == SDLK_RETURN) sm->activateScreen("Sing");
 		else if (key == SDLK_LEFT) m_songs.advance(-1);
 		else if (key == SDLK_RIGHT) m_songs.advance(1);
@@ -59,7 +59,7 @@ void ScreenSongs::manageEvent(SDL_Event event) {
 	}
 	// The rest are only available when there are songs available
 	else if (m_songs.empty()) return;
-	else if (key == SDLK_SPACE || (key == SDLK_PAUSE || (key == SDLK_p && mod && KMOD_CTRL))) m_audio.togglePause();
+	else if (key == SDLK_SPACE || (key == SDLK_PAUSE || (key == SDLK_p && mod & KMOD_CTRL))) m_audio.togglePause();
 	else if (key == SDLK_TAB && !(mod & KMOD_ALT)) m_songs.randomize();
 	else if (key == SDLK_RETURN) sm->activateScreen("Sing");
 	else if (key == SDLK_LEFT) m_songs.advance(-1);