jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Join the input thread without interrupting first

Browse source 
Otherwise we'll kill it before it finishes draining
This commit is contained in:
Cameron Gutman 2021-05-15 22:56:44 -05:00
commit ed9301f3f8
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/InputStream.c
View file

@ -364,14 +364,12 @@ int stopInputStream(void) {
// Signal the input send thread to drain all pending // Signal the input send thread to drain all pending
// input packets before shutting down. // input packets before shutting down.
LbqSignalQueueDrain(&packetQueue); LbqSignalQueueDrain(&packetQueue);
PltJoinThread(&inputSendThread);
PltCloseThread(&inputSendThread);
if (inputSock != INVALID_SOCKET) { if (inputSock != INVALID_SOCKET) {
shutdownTcpSocket(inputSock); shutdownTcpSocket(inputSock);
} }
PltInterruptThread(&inputSendThread);
PltJoinThread(&inputSendThread);
PltCloseThread(&inputSendThread);
if (inputSock != INVALID_SOCKET) { if (inputSock != INVALID_SOCKET) {
closeSocket(inputSock); closeSocket(inputSock);

1
src/Platform.c
View file

@ -167,7 +167,6 @@ void PltUnlockMutex(PLT_MUTEX* mutex) {
} }
void PltJoinThread(PLT_THREAD* thread) { void PltJoinThread(PLT_THREAD* thread) {
LC_ASSERT(thread->cancelled);
#if defined(LC_WINDOWS) #if defined(LC_WINDOWS)
WaitForSingleObjectEx(thread->handle, INFINITE, FALSE); WaitForSingleObjectEx(thread->handle, INFINITE, FALSE);
#elif defined(__vita__) #elif defined(__vita__)