diff options
| author | elmot <elmot@vaadin.com> | 2016-04-13 15:01:50 +0300 |
|---|---|---|
| committer | elmot <elmot@vaadin.com> | 2016-04-13 15:32:47 +0300 |
| commit | 980f879176696906c25e985e4f7c8e3bdc04258d (patch) | |
| tree | d781a70e24eef0994ba5d371280e1cf837f94825 /server/src/main/java/com/vaadin/ui/Window.java | |
| parent | f7f5ba596dbba0c2374a6d8ac10e89362cbbaeb5 (diff) | |
| parent | 9b46608f6c645c4289b854e2949bae3b1a2f5147 (diff) | |
| download | vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.tar.gz vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.zip | |
Merge branch 'master' into feature/mavenize
Change-Id: Id7db526d07a14ac259cbb50415bbafd2a7c2ab94
Diffstat (limited to 'server/src/main/java/com/vaadin/ui/Window.java')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/Window.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java index b5cd384f53..70399ae566 100644 --- a/server/src/main/java/com/vaadin/ui/Window.java +++ b/server/src/main/java/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) { |