Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Fix session quickload taking ownership of frozen objects by providing a clone following 003d588d13/D2302 and a report by minohaka.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D2406
Tested on: gcc 9.2.0, Jenkins

This was SVN commit r23136.
This commit is contained in:
elexis 2019-11-05 14:24:24 +00:00
parent 403784966e
commit 570891e362
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/simulation2/system/TurnManager.cpp
View File

@ -309,6 +309,7 @@ void CTurnManager::QuickSave(JS::HandleValue GUIMetadata)
if (JS_StructuredClone(cx, GUIMetadata, &m_QuickSaveMetadata, nullptr, nullptr))
{
// Freeze state to ensure that consectuvie loads don't modify the state
m_Simulation2.GetScriptInterface().FreezeObject(m_QuickSaveMetadata, true);
}
else
@ -346,8 +347,16 @@ void CTurnManager::QuickLoad()
JSContext* cx = m_Simulation2.GetScriptInterface().GetContext();
JSAutoRequest rq(cx);
// Provide a copy, so that GUI components don't have to clone to get mutable objects
JS::RootedValue quickSaveMetadataClone(cx);
if (!JS_StructuredClone(cx, m_QuickSaveMetadata, &quickSaveMetadataClone, nullptr, nullptr))
{
LOGERROR("Failed to clone quicksave state!");
return;
}
JS::AutoValueArray<1> paramData(cx);
paramData[0].set(m_QuickSaveMetadata);
paramData[0].set(quickSaveMetadataClone);
g_GUI->SendEventToAll("SavegameLoaded", paramData);
LOGMESSAGERENDER("Quickloaded game");