sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes an occasional crash when hotloading GUI files.

Browse Source 
Refs #2241

This was SVN commit r14573.
This commit is contained in:
Yves 2014-01-11 20:53:01 +00:00
parent bc9b76c86b
commit 8195e767ef
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/gui/GUIManager.cpp
View File

@ -175,13 +175,17 @@ void CGUIManager::DisplayMessageBox(int width, int height, const CStrW& title, c
void CGUIManager::LoadPage(SGUIPage& page)
{
// If we're hotloading then try to grab some data from the previous page
// TODO: Currently we have to guarantee that previousPageScriptInterface lives longer than hotloadData because the structured
// clone needs a JSContext (which is part of previousPageScriptInterface) to be freed. This changes with the SpiderMonkey upgrade.
// This function can be cleanup up a bit after the upgrade.
shared_ptr<ScriptInterface> previousPageScriptInterface;
shared_ptr<ScriptInterface::StructuredClone> hotloadData;
if (page.gui)
{
CScriptVal hotloadDataVal;
shared_ptr<ScriptInterface> scriptInterface = page.gui->GetScriptInterface();
scriptInterface->CallFunction(scriptInterface->GetGlobalObject(), "getHotloadData", hotloadDataVal);
hotloadData = scriptInterface->WriteStructuredClone(hotloadDataVal.get());
previousPageScriptInterface = page.gui->GetScriptInterface();
previousPageScriptInterface->CallFunction(previousPageScriptInterface->GetGlobalObject(), "getHotloadData", hotloadDataVal);
hotloadData = previousPageScriptInterface->WriteStructuredClone(hotloadDataVal.get());
}
page.inputs.clear();
@ -194,9 +198,16 @@ void CGUIManager::LoadPage(SGUIPage& page)
CXeromyces xero;
if (xero.Load(g_VFS, path) != PSRETURN_OK)
{
if (hotloadData)
hotloadData.reset();
if (previousPageScriptInterface)
previousPageScriptInterface.reset();
// Fail silently (Xeromyces reported the error)
return;
}
int elmt_page = xero.GetElementID("page");
int elmt_include = xero.GetElementID("include");
@ -205,6 +216,12 @@ void CGUIManager::LoadPage(SGUIPage& page)
if (root.GetNodeName() != elmt_page)
{
LOGERROR(L"GUI page '%ls' must have root element <page>", page.name.c_str());
if (hotloadData)
hotloadData.reset();
if (previousPageScriptInterface)
previousPageScriptInterface.reset();
return;
}
@ -252,6 +269,11 @@ void CGUIManager::LoadPage(SGUIPage& page)
}
m_CurrentGUI = oldGUI;
if (hotloadData)
hotloadData.reset();
if (previousPageScriptInterface)
previousPageScriptInterface.reset();
}
Status CGUIManager::ReloadChangedFiles(const VfsPath& path)