From 24acd058a88aa00d3a968fb954223f994aff9010 Mon Sep 17 00:00:00 2001
From: Peter Fortuin <peter.fortuin@gmail.com>
Date: Wed, 7 Aug 2019 11:35:50 +0200
Subject: [PATCH] Fixed race condition in google-client-loaded (for 2.x branch)

---
 google-client-loader.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/google-client-loader.html b/google-client-loader.html
index 0f4168a..d314470 100644
--- a/google-client-loader.html
+++ b/google-client-loader.html
@@ -143,7 +143,11 @@
         if (!this.shadowRoot) { this.attachShadow({mode: 'open'}); }
         this.shadowRoot.appendChild(this._loader);
 
-        this.listen(this._loader, 'js-api-load', '_loadClient');
+        if (this._loader.libraryLoaded) {
+          this._loadClient();
+        } else {
+          this.listen(this._loader, 'js-api-load', '_loadClient');
+        }
       },
 
       detached: function() {