From 299a6a7066c8be929acb85cd713a600aa502ef5f Mon Sep 17 00:00:00 2001
From: zousar <2936246+zousar@users.noreply.github.com>
Date: Tue, 18 Jan 2022 14:15:25 -0700
Subject: IoRunner join error fix

Fix crash on shutdown if m_IoRunner was not joinable.  Experienced when running windows service.
---
 zenserver/zenserver.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'zenserver/zenserver.cpp')

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 5fdc81568..96b04bdcd 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -373,7 +373,10 @@ public:
 		ZEN_INFO(ZEN_APP_NAME " exiting");
 
 		m_IoContext.stop();
-		m_IoRunner.join();
+		if (m_IoRunner.joinable())
+		{
+			m_IoRunner.join();
+		}
 
 		Flush();
 	}
-- 
cgit v1.2.3