mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +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

20
src/openrct2/scripting/ScriptEngine.h
View File

@@ -58,13 +58,30 @@ namespace OpenRCT2::Scripting
std::shared_ptr<Plugin> GetCurrentPlugin() { return _plugin; }
};
class DukContext
{
private:
duk_context * _context{};
public:
DukContext();
DukContext(DukContext&) = delete;
DukContext(DukContext&& src)
: _context(std::move(src._context))
{
}
~DukContext();
operator duk_context*() { return _context; }
};
class ScriptEngine
{
private:
InteractiveConsole& _console;
IPlatformEnvironment& _env;
DukContext _context;
bool _initialised{};
duk_context * _context{};
std::queue<std::tuple<std::promise<void>, std::string>> _evalQueue;
std::vector<std::shared_ptr<Plugin>> _plugins;
uint32 _lastHotReloadCheckTick{};
@@ -74,7 +91,6 @@ namespace OpenRCT2::Scripting
public:
ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& env);
ScriptEngine(ScriptEngine&) = delete;
~ScriptEngine();
HookEngine& GetHookEngine() { return _hookEngine; }