fixes #1452

svn changeset:3939/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
index 34fb9df5a1857bf2d882a86b919cf2e4b91a50e0..bbe366cbd423ec21d5bbc000f009a43efd2308a6 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
@@ -103,14 +103,18 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
                             "Submit cancelled (disabled, no file or already submitted)");
             return;
         }
+        // flush possibly pending variable changes, so they will be handled
+        // before upload
+        client.sendPendingVariableChanges();
+
         submitted = true;
         ApplicationConnection.getConsole().log("Submitted form");
 
         disableUpload();
 
         /*
-         * visit server after upload to see possible changes from UploadStarted
-         * event
+         * Visit server a moment after upload has started to see possible
+         * changes from UploadStarted event. Will be cleared on complete.
          */
         t = new Timer() {
             public void run() {