From 25fafb261e6e09809fc8118e24239d166595ac8b Mon Sep 17 00:00:00 2001
From: puzl <puzl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date: Sat, 20 May 2006 17:24:03 +0000
Subject: [PATCH] Mantis: 0001130 o Fixed a bug where the commanded has no
 pointer if the CC is entered while the popupmenu is active.

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@498 67975925-1194-0748-b3d5-c16f83f1a3a1
---
 releases/3.2.0/source/mod/AvHHud.cpp | 2 +-
 releases/3.2.0/source/ui/UIHud.cpp   | 7 +++++++
 releases/3.2.0/source/ui/UIHud.h     | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/releases/3.2.0/source/mod/AvHHud.cpp b/releases/3.2.0/source/mod/AvHHud.cpp
index f5e3e35..69511b5 100644
--- a/releases/3.2.0/source/mod/AvHHud.cpp
+++ b/releases/3.2.0/source/mod/AvHHud.cpp
@@ -2814,7 +2814,7 @@ int	AvHHud::SetTopDown(const char* pszName, int iSize, void* pbuf)
 		{
 			// Switch to top down mode!
 			this->mInTopDownMode = true;
-			this->ToggleMouse();
+			this->ShowMouse();
 		}
 		
 		if(is_top_down)
diff --git a/releases/3.2.0/source/ui/UIHud.cpp b/releases/3.2.0/source/ui/UIHud.cpp
index 8bac6cb..bd81dde 100644
--- a/releases/3.2.0/source/ui/UIHud.cpp
+++ b/releases/3.2.0/source/ui/UIHud.cpp
@@ -574,6 +574,13 @@ void UIHud::ToggleEditMode(void)
     }
 }
 
+void UIHud::ShowMouse(void)
+{
+    // For now this also changes us into edit mode
+	if ( this->mManager.InMouseMode() == false ) 
+		this->mManager.ToggleMouse();
+}
+
 void UIHud::ToggleMouse(void)
 {
     // For now this also changes us into edit mode
diff --git a/releases/3.2.0/source/ui/UIHud.h b/releases/3.2.0/source/ui/UIHud.h
index 8268038..2d77846 100644
--- a/releases/3.2.0/source/ui/UIHud.h
+++ b/releases/3.2.0/source/ui/UIHud.h
@@ -65,6 +65,8 @@ public:
 
     virtual void	ToggleMouse(void);
 
+	virtual void	ShowMouse(void);
+
 	virtual int		UpdateClientData(client_data_t *cdata, float time);
 
 	virtual void	SetMusicAllowed(bool inState);