mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-23 12:54:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

The patch in 4b65f77438 seems to have fixed the crash, but the initData value doesn't match the JSContext's compartment, so it's theoretically wrong.

Browse Source 
This should fix it correctly.

#Refs 2241

This was SVN commit r14508.
This commit is contained in:
Yves
2014-01-04 21:49:36 +00:00
parent 4b65f77438
commit 6ca6a5f779
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/scripting/ScriptFunctions.cpp
+5 -3
View File
@@ -86,10 +86,12 @@ namespace {
// Note that the initData argument may only contain clonable data.
// Functions aren't supported for example!
// TODO: Use LOGERROR to print a friendly error message when the requirements aren't met instead of failing with debug_warn when cloning.
void PushGuiPage(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), std::wstring name, CScriptVal initData)
void PushGuiPage(ScriptInterface::CxPrivate* pCxPrivate, std::wstring name, CScriptVal initData)
{
// TODO: we currently use the ScriptInterface of g_GUI. Check the comment in CGUIManager::SwitchPage for a detailed explanation.
g_GUI->PushPage(name, g_GUI->GetScriptInterface()->WriteStructuredClone(initData.get()));
// TODO: Check the comment in CGUIManager::SwitchPage for a detailed explanation of this hack.
CScriptVal cloneSaveInitData;
cloneSaveInitData = g_GUI->GetScriptInterface()->CloneValueFromOtherContext(*(pCxPrivate->pScriptInterface), initData.get());
g_GUI->PushPage(name, g_GUI->GetScriptInterface()->WriteStructuredClone(cloneSaveInitData.get()));
}
void SwitchGuiPage(ScriptInterface::CxPrivate* pCxPrivate, std::wstring name, CScriptVal initData)