[Performous-commit] Tapio Vierros : Whammy and tilt won' t bring the join menu back at start anymore.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: opengl2
Commit: 2bb0dde5c5fee07528c203447150a742c29c9a0e

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Jan  3 18:16:11 2011 +0200

Whammy and tilt won't bring the join menu back at start anymore.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index f7055ce..d3422d7 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -327,7 +327,8 @@ void GuitarGraph::engine() {
 			break;
 
 		// If the songs hasn't yet started, we want key presses to bring join menu back (not pause menu)
-		} else if (time < -2 && ev.type == input::Event::PRESS) {
+		} else if (time < -2 && ev.type == input::Event::PRESS
+		  && ev.button != input::WHAMMY_BUTTON && ev.button != input::GODMODE_BUTTON) {
 			setupJoinMenu();
 			m_menu.open();
 			break;