From aebedbd1508575498d9da84e99c10bab7f6b3b32 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 3 Jun 2021 15:47:01 +0200
Subject: [PATCH] MOBILE-3320 core: Fix cancel reconnect when app is resumed

---
 src/app/app.component.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index bc4d2881f..7457bda23 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -132,16 +132,21 @@ export class AppComponent implements OnInit, AfterViewInit {
 
         // Check InAppBrowser closed.
         CoreEvents.on(CoreEvents.IAB_EXIT, () => {
-            CoreLoginHelper.setWaitingForBrowser(false);
             this.lastInAppUrl = '';
-            CoreLoginHelper.checkLogout();
+
+            if (CoreLoginHelper.isWaitingForBrowser()) {
+                CoreLoginHelper.setWaitingForBrowser(false);
+                CoreLoginHelper.checkLogout();
+            }
         });
 
         Platform.resume.subscribe(() => {
             // Wait a second before setting it to false since in iOS there could be some frozen WS calls.
             setTimeout(() => {
-                CoreLoginHelper.setWaitingForBrowser(false);
-                CoreLoginHelper.checkLogout();
+                if (CoreLoginHelper.isWaitingForBrowser()) {
+                    CoreLoginHelper.setWaitingForBrowser(false);
+                    CoreLoginHelper.checkLogout();
+                }
             }, 1000);
         });