[Performous-commit] Tapio Vierros : Start button now closes the joinmenu.

[Johnny O. <js...@us...>]

Module: performous
Branch: opengl2
Commit: 2a243727590c39c5459e04ac74703dc61b5362de

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Oct 27 16:48:29 2010 +0300

Start button now closes the joinmenu.

---

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

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 7246d9b..cd35c33 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -277,8 +277,8 @@ void DanceGraph::engine() {
 		}
 		// Menu keys
 		if (menuOpen() && ev.type == input::Event::PRESS) {
-			if (ev.nav == input::CANCEL) m_menu.close();
-			else if (ev.nav == input::RIGHT || ev.nav == input::START) m_menu.action(1);
+			if (ev.nav == input::START || ev.nav == input::CANCEL) m_menu.close();
+			else if (ev.nav == input::RIGHT) m_menu.action(1);
 			else if (ev.nav == input::LEFT) m_menu.action(-1);
 			else if (ev.nav == input::UP) m_menu.move(-1);
 			else if (ev.nav == input::DOWN) m_menu.move(1);
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 5ec2f93..538c5ed 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -315,7 +315,7 @@ void GuitarGraph::engine() {
 			// Strum (strum of keyboard-as-guitar doesn't generate nav-events)
 			else if (ev.type == input::Event::PICK && ev.button == 0) m_menu.move(1);
 			else if (ev.type == input::Event::PICK && ev.button == 1) m_menu.move(-1);
-			else if (ev.nav == input::START) m_menu.action();
+			else if (ev.nav == input::START || ev.nav == input::CANCEL) m_menu.close();
 			// See if anything changed
 			if (!m_drums && m_selectedTrack.so() != m_track_index->first) setTrack(m_selectedTrack.so());
 			else if (boost::lexical_cast<int>(m_selectedDifficulty.so()) != m_level)