From b5ad2e27e9c36bcc7697013f2cd2ab58688b0088 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 6 Jan 2017 06:46:48 +0000 Subject: [PATCH] - Do not use Escape as a key for passing priority until end of turn. --- .../src/main/java/forge/screens/match/views/VPrompt.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java index aaeff350882..d30030bf10a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java @@ -58,7 +58,9 @@ public class VPrompt implements IVDoc { public void keyPressed(final KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { if (btnCancel.isEnabled()) { - btnCancel.doClick(); + if (!btnCancel.getText().equals("End Turn")) { + btnCancel.doClick(); + } } } }