Fixed #2053 : Closing browse-window should trigger submitting changes and fire close-event

svn changeset:5351/svn branch:trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/itmill/toolkit/ui/Window.java b/src/com/itmill/toolkit/ui/Window.java
index b9ecf8b255..e8201d4fdf 100644
--- a/src/com/itmill/toolkit/ui/Window.java
+++ b/src/com/itmill/toolkit/ui/Window.java
@@ -843,9 +843,14 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
     /**
      * Method that handles window closing (from UI). If one wants to have window
      * that cannot be closed (with server side check), override this with and
-     * empty method.
+     * empty method. Main window of the application can not be closed (on the
+     * server-side).
      */
     protected void close() {
+        if (getApplication() != null
+                && getApplication().getMainWindow() == this) {
+            return;
+        }
         Window parent = (Window) getParent();
         if (parent == null) {
             setVisible(false);