From d0e9889f7de147a543957e89bd35ced459f04842 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Fri, 3 Jan 2020 23:43:04 +0100
Subject: [PATCH] Fix race condition when Zigbee starts. #2591

---
 lib/controller.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/controller.js b/lib/controller.js
index 11b02aaf..d5524586 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -89,9 +89,10 @@ class Controller {
 
         // Start zigbee
         try {
+            await this.zigbee.start();
+            this.callExtensionMethod('onZigbeeStarted', []);
             this.zigbee.on('event', this.onZigbeeEvent.bind(this));
             this.zigbee.on('adapterDisconnected', this.onZigbeeAdapterDisconnected);
-            await this.zigbee.start();
         } catch (error) {
             logger.error('Failed to start zigbee');
             logger.error('Exiting...');
@@ -123,9 +124,6 @@ class Controller {
 
         this.zigbee.permitJoin(settings.get().permit_join);
 
-        // Call extensions
-        this.callExtensionMethod('onZigbeeStarted', []);
-
         // MQTT
         this.mqtt.on('message', this.onMQTTMessage.bind(this));
         await this.mqtt.connect();