Join the input thread without interrupting first
Otherwise we'll kill it before it finishes draining
This commit is contained in:
parent
431e188b07
commit
ed9301f3f8
2 changed files with 2 additions and 5 deletions
|
|
@ -364,14 +364,12 @@ int stopInputStream(void) {
|
|||
// Signal the input send thread to drain all pending
|
||||
// input packets before shutting down.
|
||||
LbqSignalQueueDrain(&packetQueue);
|
||||
PltJoinThread(&inputSendThread);
|
||||
PltCloseThread(&inputSendThread);
|
||||
|
||||
if (inputSock != INVALID_SOCKET) {
|
||||
shutdownTcpSocket(inputSock);
|
||||
}
|
||||
|
||||
PltInterruptThread(&inputSendThread);
|
||||
PltJoinThread(&inputSendThread);
|
||||
PltCloseThread(&inputSendThread);
|
||||
|
||||
if (inputSock != INVALID_SOCKET) {
|
||||
closeSocket(inputSock);
|
||||
|
|
|
|||
|
|
@ -167,7 +167,6 @@ void PltUnlockMutex(PLT_MUTEX* mutex) {
|
|||
}
|
||||
|
||||
void PltJoinThread(PLT_THREAD* thread) {
|
||||
LC_ASSERT(thread->cancelled);
|
||||
#if defined(LC_WINDOWS)
|
||||
WaitForSingleObjectEx(thread->handle, INFINITE, FALSE);
|
||||
#elif defined(__vita__)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue