mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix segfault on exit

Browse Source 
By ensuring duk_context is disposed last in ScriptEngine
This commit is contained in:
Ted John
2018-03-23 23:39:46 +00:00
parent d445cfc125
commit c340c2abec
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -31,6 +31,20 @@ using namespace OpenRCT2::Scripting;
static std::string Stringify(duk_context * ctx, duk_idx_t idx);
DukContext::DukContext()
{
_context = duk_create_heap_default();
if (_context == nullptr)
{
throw std::runtime_error("Unable to initialise duktape context.");
}
}
DukContext::~DukContext()
{
duk_destroy_heap(_context);
}
ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& env) :
_console(console),
_env(env),
@@ -38,20 +52,9 @@ ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& en
{
}
ScriptEngine::~ScriptEngine()
{
duk_destroy_heap(_context);
}
void ScriptEngine::Initialise()
{
_context = duk_create_heap_default();
if (_context == nullptr)
{
throw std::runtime_error("Unable to initialise duktape context.");
}
auto ctx = _context;
auto ctx = (duk_context*)_context;
ScConsole::Register(ctx);
ScContext::Register(ctx);
ScDisposable::Register(ctx);