[Performous-commit] Tapio Vierros : Fix instruments not being allowed to open their pause menus .

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: cb849b0288532bc58dcb80effccbf4b744ec6f7d

Author: Tapio Vierros <tap...@gm...>
Date:   Fri Jul 16 20:53:35 2010 +0300

Fix instruments not being allowed to open their pause menus.

---

 game/screen_sing.cc |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 4998506..a367263 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -367,13 +367,15 @@ void ScreenSing::draw() {
 	// Menu mangling
 	// We don't allow instrument menus during global menu
 	// except for joining, in which case global menu is closed
-	for (Instruments::iterator it = m_instruments.begin(); it != m_instruments.end(); ++it) {
-		if (!it->dead() && !it->joining(time)) it->toggleMenu(0);
-		else if (!it->dead() && it->joining(time)) m_menu.close();
-	}
-	for (Dancers::iterator it = m_dancers.begin(); it != m_dancers.end(); ++it) {
-		if (!it->dead() && !it->joining(time)) it->toggleMenu(0);
-		else if (!it->dead() && it->joining(time)) m_menu.close();
+	if (m_menu.isOpen()) {
+		for (Instruments::iterator it = m_instruments.begin(); it != m_instruments.end(); ++it) {
+			if (!it->dead() && !it->joining(time)) it->toggleMenu(0);
+			else if (!it->dead() && it->joining(time)) m_menu.close();
+		}
+		for (Dancers::iterator it = m_dancers.begin(); it != m_dancers.end(); ++it) {
+			if (!it->dead() && !it->joining(time)) it->toggleMenu(0);
+			else if (!it->dead() && it->joining(time)) m_menu.close();
+		}
 	}
 
 	// Rendering starts