diff options
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index f96fccdac..8fb91c890 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -361,6 +361,7 @@ public: ZEN_INFO(ZEN_APP_NAME " exiting"); m_IoContext.stop(); + m_IoRunner.join(); Flush(); } @@ -386,7 +387,7 @@ public: { if (!m_IoRunner.joinable()) { - m_IoRunner = std::jthread{[this] { m_IoContext.run(); }}; + m_IoRunner = std::thread{[this] { m_IoContext.run(); }}; } } @@ -482,7 +483,7 @@ private: CbObject m_RootManifest; std::filesystem::path m_DataRoot; std::filesystem::path m_ContentRoot; - std::jthread m_IoRunner; + std::thread m_IoRunner; asio::io_context m_IoContext; asio::steady_timer m_PidCheckTimer{m_IoContext}; zen::ProcessMonitor m_ProcessMonitor; |