From 499ae400261d05f4f20c1c7d5398f1a9732b2dcc Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Wed, 14 May 2014 00:03:24 +0000
Subject: [PATCH] Prevent showing menu if overlay open

---
 forge-gui-mobile/src/forge/Forge.java                     | 4 +++-
 forge-gui-mobile/src/forge/screens/match/MatchScreen.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index d03c378e77d..db61f72ab89 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -109,7 +109,9 @@ public class Forge implements ApplicationListener {
     public static void showMenu() {
         if (currentScreen == null) { return; }
         endKeyInput(); //end key input before menu shown
-        currentScreen.showMenu();
+        if (FOverlay.getTopOverlay() == null) { //don't show menu if overlay open
+            currentScreen.showMenu();
+        }
     }
 
     public static void back() {
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index bc6b735655f..7b1e7b97400 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -182,7 +182,7 @@ public class MatchScreen extends FScreen {
         case Keys.ESCAPE:
             return prompt.getBtnCancel().trigger(); //otherwise trigger Cancel
         case Keys.BACK:
-            FControl.undoLastAction(); //let back trigger undo instead of going back a screen
+            FControl.undoLastAction(); //let Back trigger undo instead of going back a screen
             return true;
         case Keys.A: //alpha strike on Ctrl+A
             if (KeyInputAdapter.isCtrlKeyDown()) {