Fix menu issues when hitting the ESC (cancel) key.

Fixes ticket:2697
Warzone2100 · Jun 12, 2011 · 7bf5a23 · 7bf5a23
1 parent 316272b
commit 7bf5a23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/frontend.cpp b/src/frontend.cpp
@@ -80,7 +80,12 @@ bool			bLimiterLoaded = false;
 //
 bool CancelPressed(void)
 {
-	return keyPressed(KEY_ESC);
+	const bool cancel = keyPressed(KEY_ESC);
+	if (cancel)
+	{
+		inputLoseFocus();	// clear the input buffer.
+	}
+	return cancel;
 }
 
 

diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -3467,14 +3467,7 @@ void runMultiOptions(void)
 
 	if (CancelPressed())
 	{
-		if (multiRequestUp)
-		{
-			changeTitleMode(lastTitleMode);
-		}
-		else
-		{
-			processMultiopWidgets(CON_CANCEL);  // "Press" the cancel button to clean up net connections and stuff.
-		}
+		processMultiopWidgets(CON_CANCEL);  // "Press" the cancel button to clean up net connections and stuff.
 	}
 }
 

diff --git a/src/multimenu.cpp b/src/multimenu.cpp
@@ -59,6 +59,7 @@
 #include "keybind.h"
 #include "loop.h"
 #include "lib/framework/frameint.h"
+#include "frontend.h"
 
 // ////////////////////////////////////////////////////////////////////////////
 // defines
@@ -664,7 +665,7 @@ static void closeMultiRequester(void)
 
 bool runMultiRequester(UDWORD id,UDWORD *mode, char *chosen,UDWORD *chosenValue)
 {
-	if( id==M_REQUEST_CLOSE)							// close
+	if( (id == M_REQUEST_CLOSE) || CancelPressed() )			// user hit close box || hit the cancel key
 	{
 		closeMultiRequester();
 		return true;