From 601e1f097bcaed821004dcd5607d162970ce9ad9 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 16 Sep 2008 23:34:10 +0000
Subject: [PATCH] scoreboard closing fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2652 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/protos.h       | 1 +
 source/src/scoreboard.cpp | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/src/protos.h b/source/src/protos.h
index 4653187e..31f8a4e1 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -103,6 +103,7 @@ extern void rendermenumdl();
 extern void menuset(void *m);
 extern void menuselect(void *menu, int sel);
 extern void showmenu(const char *name);
+extern void closemenu(const char *name);
 extern void addchange(const char *desc, int type);
 extern void clearchanges(int type);
 extern void refreshapplymenu(void *menu, bool init);
diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp
index d114ac6b..388c910b 100644
--- a/source/src/scoreboard.cpp
+++ b/source/src/scoreboard.cpp
@@ -7,7 +7,13 @@ void *scoremenu = NULL, *teammenu = NULL, *ctfmenu = NULL;
 
 void showscores(bool on)
 {
-    menuset(on ? (m_flags ? ctfmenu : (m_teammode ? teammenu : scoremenu)) : NULL);
+    if(on) menuset(m_flags ? ctfmenu : (m_teammode ? teammenu : scoremenu));
+    else
+    {
+        closemenu("score");
+        closemenu("team score");
+        closemenu("ctf score");
+    }
 }
 
 COMMAND(showscores, ARG_DOWN);