flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2383 from cuberite/GoogleTestFix

Browse Source 
Fixed cNetworkSingleton's HasTerminated flag.
This commit is contained in:
Julian Laubstein 2015-07-23 21:18:16 +02:00
commit 7cb981443e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/OSSupport/NetworkSingleton.cpp
View File

@ -93,7 +93,6 @@ cNetworkSingleton & cNetworkSingleton::Get(void)
void cNetworkSingleton::Terminate(void) void cNetworkSingleton::Terminate(void)
{ {
ASSERT(!m_HasTerminated); ASSERT(!m_HasTerminated);
m_HasTerminated = true;
// Wait for the LibEvent event loop to terminate: // Wait for the LibEvent event loop to terminate:
event_base_loopbreak(m_EventBase); event_base_loopbreak(m_EventBase);
@ -113,6 +112,10 @@ void cNetworkSingleton::Terminate(void)
event_base_free(m_EventBase); event_base_free(m_EventBase);
libevent_global_shutdown(); libevent_global_shutdown();
// Set the HasTerminated flag:
// (Only set the flag after everything has been removed, to avoid the random failures in the Google-test, caused by links terminating after this flag was set)
m_HasTerminated = true;
} }