aboutsummaryrefslogtreecommitdiff
path: root/zenserver/zenserver.cpp
diff options
context:
space:
mode:
authorzousar <[email protected]>2022-01-18 14:15:25 -0700
committerzousar <[email protected]>2022-01-18 14:15:25 -0700
commit299a6a7066c8be929acb85cd713a600aa502ef5f (patch)
tree367ea1318d64361a3293bcd1285299e69423fde8 /zenserver/zenserver.cpp
parentSupport chunk requests with no ValueId, and interpret them as requested for v... (diff)
downloadzen-299a6a7066c8be929acb85cd713a600aa502ef5f.tar.xz
zen-299a6a7066c8be929acb85cd713a600aa502ef5f.zip
IoRunner join error fix
Fix crash on shutdown if m_IoRunner was not joinable. Experienced when running windows service.
Diffstat (limited to 'zenserver/zenserver.cpp')
-rw-r--r--zenserver/zenserver.cpp5
1 files changed, 4 insertions, 1 deletions
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();
}