ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Debugger] JS API: Fix socket closing itself (#2173)

This commit is contained in:
shyguyhex 2022-01-20 17:22:44 -06:00 committed by GitHub
parent 97547123b6
commit 93740c612f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64/UserInterface/Debugger/ScriptAPI/JSSocketWorker.cpp
View File

@ -104,6 +104,7 @@ void CJSSocketWorker::WorkerProc()
bool bConnectPending = false; bool bConnectPending = false;
bool bWritesPending = false; bool bWritesPending = false;
bool bRecvClosed = false; bool bRecvClosed = false;
bool bSendClosed = false;
{ {
CGuard guard(m_Queue.cs); CGuard guard(m_Queue.cs);
@ -132,6 +133,7 @@ void CJSSocketWorker::WorkerProc()
CGuard guard(m_Queue.cs); CGuard guard(m_Queue.cs);
bWritesPending = m_Queue.writes.size() > 0; bWritesPending = m_Queue.writes.size() > 0;
bRecvClosed = m_Queue.bRecvClosed; bRecvClosed = m_Queue.bRecvClosed;
bSendClosed = m_Queue.bSendClosed;
if (m_Queue.bFullClosePending && !bWritesPending) if (m_Queue.bFullClosePending && !bWritesPending)
{ {
@ -180,7 +182,7 @@ void CJSSocketWorker::WorkerProc()
bool bWritable = pWriteFds && FD_ISSET(m_Socket, pWriteFds); bool bWritable = pWriteFds && FD_ISSET(m_Socket, pWriteFds);
bool bReadable = pReadFds && FD_ISSET(m_Socket, pReadFds); bool bReadable = pReadFds && FD_ISSET(m_Socket, pReadFds);
if (bWritable && !m_Queue.bSendClosed) if (bWritable)
{ {
if (!bHaveConnection) if (!bHaveConnection)
{ {
@ -188,12 +190,12 @@ void CJSSocketWorker::WorkerProc()
JSEmitConnect(); JSEmitConnect();
} }
if (bWritesPending) if (!bSendClosed && bWritesPending)
{ {
ProcSendData(); ProcSendData();
} }
} }
else if (bHaveConnection) else if (pWriteFds && bHaveConnection)
{ {
JSEmitError("connection reset"); JSEmitError("connection reset");
break; break;