From 9b46608f6c645c4289b854e2949bae3b1a2f5147 Mon Sep 17 00:00:00 2001
From: Teemu Pöntelin <tehapo@gmail.com>
Date: Sun, 3 Apr 2016 23:22:48 +0300
Subject: Prevent closing of uncloseable Window on esc (#19700)

Change-Id: I4d67cd84c6f4179da6d6fea6b881e8ccd65e70d9
---
 server/src/com/vaadin/ui/Window.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index b5cd384f53..70399ae566 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -1051,7 +1051,9 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
 
         @Override
         public void handleAction(Object sender, Object target) {
-            window.close();
+            if (window.isClosable()) {
+                window.close();
+            }
         }
 
         public boolean equals(int keyCode, int... modifiers) {
-- 
cgit v1.2.3