From d9ebf4ef71eea267bf1c1dbd52d89b04f12f6576 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 24 Apr 2015 14:06:03 +0300
Subject: Ensure application is stopped when stopped events are sent (#11733)

Failing to do this cause an infinite loop if a stop event causes stopping of the application

Change-Id: Ibb36c2eca6c6e1bc10192b4d2d808042793fb2fa
---
 client/src/com/vaadin/client/ApplicationConnection.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 4f7b8d34fc..f5a4d7dba0 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -3527,11 +3527,12 @@ public class ApplicationConnection implements HasHandlers {
         communicationErrorDelegate = delegate;
     }
 
-    public void setApplicationRunning(boolean running) {
-        if (applicationRunning && !running) {
+    public void setApplicationRunning(boolean applicationRunning) {
+        boolean stopped = (this.applicationRunning && !applicationRunning);
+        this.applicationRunning = applicationRunning;
+        if (stopped) {
             eventBus.fireEvent(new ApplicationStoppedEvent());
         }
-        applicationRunning = running;
     }
 
     public boolean isApplicationRunning() {
-- 
cgit v1.2.3