LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use SDL_DetachThread instead of a conditional SDL_WaitThread when a Thread is destroyed.

Browse Source
This commit is contained in:
Alex Szpakowski
2016-09-08 23:33:48 -03:00
parent e803878445
commit 0b1bfba493
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/thread/sdl/Thread.cpp
+7 -11
View File
@@ -35,13 +35,9 @@ Thread::Thread(Threadable *t)
Thread::~Thread() Thread::~Thread()
{ {
if (!running) // Clean up handle // Clean up handle
wait(); if (thread)
/* SDL_DetachThread(thread);
if (running)
wait();
FIXME: Needed for proper thread cleanup
*/
} }
bool Thread::start() bool Thread::start()
@@ -50,9 +46,9 @@ bool Thread::start()
if (running) if (running)
return false; return false;
if (thread) // Clean old handle up if (thread) // Clean old handle up
SDL_WaitThread(thread, 0); SDL_WaitThread(thread, nullptr);
thread = SDL_CreateThread(thread_runner, t->getThreadName(), this); thread = SDL_CreateThread(thread_runner, t->getThreadName(), this);
running = (thread != 0); running = (thread != nullptr);
return running; return running;
} }
@@ -63,10 +59,10 @@ void Thread::wait()
if (!thread) if (!thread)
return; return;
} }
SDL_WaitThread(thread, 0); SDL_WaitThread(thread, nullptr);
Lock l(mutex); Lock l(mutex);
running = false; running = false;
thread = 0; thread = nullptr;
} }
bool Thread::isRunning() bool Thread::isRunning()