2 files changed, 5 insertions, 7 deletions
diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp
index 000b17641..358e24438 100644
--- a/src/OSSupport/NetworkSingleton.cpp
+++ b/src/OSSupport/NetworkSingleton.cpp
@@ -63,8 +63,7 @@ cNetworkSingleton::cNetworkSingleton(void):
 	}
 
 	// Create the event loop thread:
-	std::thread EventLoopThread(RunEventLoop, this);
-	EventLoopThread.detach();
+	m_EventLoopThread = std::thread(RunEventLoop, this);
 }
 
 
@@ -98,7 +97,7 @@ void cNetworkSingleton::Terminate(void)
 
 	// Wait for the LibEvent event loop to terminate:
 	event_base_loopbreak(m_EventBase);
-	m_EventLoopTerminated.Wait();
+	m_EventLoopThread.join();
 
 	// Remove all objects:
 	{
@@ -143,7 +142,6 @@ void cNetworkSingleton::LogCallback(int a_Severity, const char * a_Msg)
 void cNetworkSingleton::RunEventLoop(cNetworkSingleton * a_Self)
 {
 	event_base_loop(a_Self->m_EventBase, EVLOOP_NO_EXIT_ON_EMPTY);
-	a_Self->m_EventLoopTerminated.Set();
 }
 
 
diff --git a/src/OSSupport/NetworkSingleton.h b/src/OSSupport/NetworkSingleton.h
index e27e19012..0536a1c82 100644
--- a/src/OSSupport/NetworkSingleton.h
+++ b/src/OSSupport/NetworkSingleton.h
@@ -116,12 +116,12 @@ protected:
 	/** Mutex protecting all containers against multithreaded access. */
 	cCriticalSection m_CS;
 
-	/** Event that gets signalled when the event loop terminates. */
-	cEvent m_EventLoopTerminated;
-
 	/** Set to true if Terminate has been called. */
 	volatile bool m_HasTerminated;
 
+	/** The thread in which the main LibEvent loop runs. */
+	std::thread m_EventLoopThread;
+
 
 	/** Initializes the LibEvent internals. */
 	cNetworkSingleton(void);