|
From: Tapio V. <aa...@us...> - 2010-08-21 14:26:49
|
Module: performous
Branch: joinmenu
Commit: 21c13ec0aa88e20cfdcc98273caaf3be8b22e913
Author: Tapio Vierros <tap...@gm...>
Date: Sat Aug 21 17:25:59 2010 +0300
Assure the menu is opened when rejoining from pause menu.
---
game/dancegraph.cc | 2 +-
game/guitargraph.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 5702ac1..eaf51da 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -277,7 +277,7 @@ void DanceGraph::engine() {
if (m_selectedTrack.so() != getTrack()) setTrack(m_selectedTrack.so());
else if (boost::lexical_cast<int>(m_selectedDifficulty.so()) != m_level)
difficulty(DanceDifficulty(boost::lexical_cast<int>(m_selectedDifficulty.so())));
- else if (m_rejoin.b()) { unjoin(); setupJoinMenu(); }
+ else if (m_rejoin.b()) { unjoin(); setupJoinMenu(); m_input.addEvent(input::Event()); }
// Sync dynamic stuff
updateJoinMenu();
// Open Menu
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index fe9935c..409298e 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -296,7 +296,7 @@ void GuitarGraph::engine() {
if (!m_drums && m_selectedTrack.so() != getTrack()) setTrack(m_selectedTrack.so());
else if (boost::lexical_cast<int>(m_selectedDifficulty.so()) != m_level)
difficulty(Difficulty(boost::lexical_cast<int>(m_selectedDifficulty.so())));
- else if (m_rejoin.b()) { unjoin(); setupJoinMenu(); }
+ else if (m_rejoin.b()) { unjoin(); setupJoinMenu(); m_input.addEvent(input::Event()); }
// Sync menu items & captions
updateJoinMenu();
break;
|