From cf5c81587970602d76c86a7408fc28b5fbf92ac8 Mon Sep 17 00:00:00 2001 From: wraitii Date: Fri, 14 May 2021 11:12:07 +0000 Subject: [PATCH] Fix 4f972bc623 Shouldn't make last-minute changes without recompiling... This was SVN commit r25435. --- source/gui/ObjectBases/IGUIObject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/gui/ObjectBases/IGUIObject.cpp b/source/gui/ObjectBases/IGUIObject.cpp index d36e005503..d8aa5dd32b 100644 --- a/source/gui/ObjectBases/IGUIObject.cpp +++ b/source/gui/ObjectBases/IGUIObject.cpp @@ -62,7 +62,7 @@ IGUIObject::IGUIObject(CGUI& pGUI) IGUIObject::~IGUIObject() { if (!m_ScriptHandlers.empty()) - JS_RemoveExtraGCRootsTracer(m_pGUI.GetScriptInterface().cx, Trace, this); + JS_RemoveExtraGCRootsTracer(ScriptRequest(m_pGUI.GetScriptInterface()).cx, Trace, this); // m_Children is deleted along all other GUI Objects in the CGUI destructor } @@ -310,7 +310,7 @@ void IGUIObject::RegisterScriptHandler(const CStr& eventName, const CStr& Code, void IGUIObject::SetScriptHandler(const CStr& eventName, JS::HandleObject Function) { if (m_ScriptHandlers.empty()) - JS_AddExtraGCRootsTracer(m_pGUI.GetScriptInterface().cx, Trace, this); + JS_AddExtraGCRootsTracer(ScriptRequest(m_pGUI.GetScriptInterface()).cx, Trace, this); m_ScriptHandlers[eventName] = JS::Heap(Function); @@ -328,7 +328,7 @@ void IGUIObject::UnsetScriptHandler(const CStr& eventName) m_ScriptHandlers.erase(it); if (m_ScriptHandlers.empty()) - JS_RemoveExtraGCRootsTracer(m_pGUI.GetScriptInterface().cx, Trace, this); + JS_RemoveExtraGCRootsTracer(ScriptRequest(m_pGUI.GetScriptInterface()).cx, Trace, this); std::unordered_map>::iterator it2 = m_pGUI.m_EventObjects.find(eventName); if (it2 == m_pGUI.m_EventObjects.end())