Registering observer before starting ASH reset. Fixes a race conditio…

…n for #23
Legrandgroup · Mar 3, 2020 · 31a2e16 · 31a2e16
1 parent f7d20b7
commit 31a2e16
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/ezsp/lib-ezsp-main.cpp b/src/ezsp/lib-ezsp-main.cpp
@@ -75,12 +75,17 @@ void CLibEzspMain::start()
     if (this->uartDriver == nullptr) {
         clogW << "Start invoked without an effective UART driver\n";
     }
-    if( dongle.open(this->uartDriver) ) {
+    this->dongle.registerObserver(this);
+    this->gp_sink.registerObserver(this);
+    if (this->dongle.open(this->uartDriver) ) {
         clogI << "EZSP serial port opened\n";
-        dongle.registerObserver(this);
-        gp_sink.registerObserver(this);
         setState(CLibEzspInternalState::WAIT_DONGLE_READY);  /* Because the dongle observer has been set to ourselves just above, our handleDongleState() method will be called back as soon as the dongle is detected */
     }
+    else {
+        clogE << "EZSP failed opening serial port\n";
+        this->dongle.unregisterObserver(this);
+        this->gp_sink.registerObserver(this);
+    }
 }
 
 void CLibEzspMain::forceFirmwareUpgradeOnInitTimeout()