diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-07 06:44:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-07 06:44:38 +0300 |
| commit | fec0a38e6a12c8674e54a29b0c3ae54fa78e86ff (patch) | |
| tree | fa68e8d59ade869c1de33bce9eb60a8cd05fdbc8 /src/net/ea/network.cpp | |
| parent | ba0d8f949647aa4ced776438a1e1e9ebd77c4660 (diff) | |
| download | manaverse-fec0a38e6a12c8674e54a29b0c3ae54fa78e86ff.tar.gz manaverse-fec0a38e6a12c8674e54a29b0c3ae54fa78e86ff.tar.bz2 manaverse-fec0a38e6a12c8674e54a29b0c3ae54fa78e86ff.tar.xz manaverse-fec0a38e6a12c8674e54a29b0c3ae54fa78e86ff.zip | |
Fix possible thread structure memory leak on SDL2 if thread terminated before cleanup.
Diffstat (limited to 'src/net/ea/network.cpp')
| -rw-r--r-- | src/net/ea/network.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index ad7909c7a..1ae4d2323 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -140,11 +140,8 @@ void Network::disconnect() BLOCK_START("Network::disconnect") mState = IDLE; - if ((mWorkerThread != nullptr) && (SDL_GetThreadID(mWorkerThread) != 0u)) - { - SDL_WaitThread(mWorkerThread, nullptr); - mWorkerThread = nullptr; - } + SDL::WaitThread(mWorkerThread); + mWorkerThread = nullptr; if (mSocket != nullptr) { |