From fec0a38e6a12c8674e54a29b0c3ae54fa78e86ff Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 7 Sep 2017 06:44:38 +0300 Subject: Fix possible thread structure memory leak on SDL2 if thread terminated before cleanup. --- src/net/ea/network.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/net/ea/network.cpp') 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) { -- cgit v1.2.3-70-g09d2