From 6b5148566cf8ee1d81ffd4ae7fd653127ebbb64e Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Wed, 19 May 2021 20:49:18 -0700
Subject: [PATCH] daemon: adjustment for emane monitor shutdown to avoid
 locking

---
 daemon/core/emane/emanemanager.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/daemon/core/emane/emanemanager.py b/daemon/core/emane/emanemanager.py
index b952d942..eb8c743b 100644
--- a/daemon/core/emane/emanemanager.py
+++ b/daemon/core/emane/emanemanager.py
@@ -613,11 +613,11 @@ class EmaneManager:
         self.doeventloop = False
         if self.service is not None:
             self.service.breakloop()
+            if self.eventmonthread is not None:
+                self.eventmonthread.join()
+                self.eventmonthread = None
             # reset the service, otherwise nextEvent won"t work
             self.deleteeventservice()
-        if self.eventmonthread is not None:
-            self.eventmonthread.join()
-            self.eventmonthread = None
 
     def eventmonitorloop(self) -> None:
         """