Fix for #2396 - loading indicator stays on in IE7

svn changeset:6308/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index b2572e8ad08cab3ba10f99d107cfdc2b5fed30b2..fc3851fee921da44ad8c808554e2c799bebd1e5e 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -419,7 +419,15 @@ public class ApplicationConnection {
             loadTimer = new Timer() {
                 @Override
                 public void run() {
-                    showLoadingIndicator();
+                    /*
+                     * IE7 does not properly cancel the event with
+                     * loadTimer.cancel() so we have to check that we really
+                     * should make it visible
+                     */
+                    if (loadTimer != null) {
+                        showLoadingIndicator();
+                    }
+
                 }
             };
             // First one kicks in at 300ms