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

Merge pull request #1757 from m000z0rz/fix-script-hang-on-stop 

Fix script hang on stop
This commit is contained in:
zilmar 2020-05-21 07:04:57 +09:30 committed by GitHub
parent e44af28b8e 9b9ab2af75
commit 1c5565333f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64/UserInterface/Debugger/ScriptInstance.cpp
View File

@ -90,9 +90,12 @@ void CScriptInstance::ForceStop()
{ {
// Close all files and delete all hooked callbacks // Close all files and delete all hooked callbacks
CGuard guard(m_CS); CGuard guard(m_CS);
if (m_State != STATE_STOPPED)
{
CleanUp(); CleanUp();
SetState(STATE_STOPPED); SetState(STATE_STOPPED);
} }
}
duk_context* CScriptInstance::DukContext() duk_context* CScriptInstance::DukContext()
{ {
@ -220,8 +223,7 @@ void CScriptInstance::StartEventLoop()
RemoveListener(lpListener); RemoveListener(lpListener);
} }
CleanUp(); ForceStop();
SetState(STATE_STOPPED);
} }
CScriptInstance::EVENT_STATUS CScriptInstance::EVENT_STATUS
@ -465,6 +467,8 @@ void CScriptInstance::InvokeListenerCallback(IOLISTENER* lpListener)
const char* msg = duk_safe_to_string(m_Ctx, -1); const char* msg = duk_safe_to_string(m_Ctx, -1);
MessageBox(NULL, stdstr(msg).ToUTF16().c_str(), L"Script error", MB_OK | MB_ICONWARNING); MessageBox(NULL, stdstr(msg).ToUTF16().c_str(), L"Script error", MB_OK | MB_ICONWARNING);
} }
duk_pop(m_Ctx);
} }
const char* CScriptInstance::Eval(const char* jsCode) const char* CScriptInstance::Eval(const char* jsCode)
@ -527,8 +531,8 @@ void CScriptInstance::CloseAllFiles()
for (size_t i = 0; i < nFiles; i++) for (size_t i = 0; i < nFiles; i++)
{ {
fclose(m_Files[i].fp); fclose(m_Files[i].fp);
m_Files.erase(m_Files.begin() + i);
} }
m_Files.clear();
} }
FILE* CScriptInstance::GetFilePointer(int fd) FILE* CScriptInstance::GetFilePointer(int fd)