diff --git a/binaries/data/mods/mod/gui/modmod/modmod.js b/binaries/data/mods/mod/gui/modmod/modmod.js index 7c1518f965..760b6889a1 100644 --- a/binaries/data/mods/mod/gui/modmod/modmod.js +++ b/binaries/data/mods/mod/gui/modmod/modmod.js @@ -71,6 +71,9 @@ function init(data, hotloadData) return new Promise(closePageCallback => { Engine.GetGUIObjectByName("quitButton").onPress = closePageCallback; + Engine.GetGUIObjectByName("cancelButton").onPress = closePageCallback.bind(undefined, { + [Engine.openRequest]: { "page": "page_pregame.xml" } + }); }); } @@ -293,11 +296,6 @@ function filterMod(folder) return !negateFilter; } -function closePage() -{ - Engine.SwitchGuiPage("page_pregame.xml", {}); -} - /** * Moves an item in the list up or down. */ diff --git a/binaries/data/mods/mod/gui/modmod/modmod.xml b/binaries/data/mods/mod/gui/modmod/modmod.xml index c72f1f1e66..86e59d3c4c 100644 --- a/binaries/data/mods/mod/gui/modmod/modmod.xml +++ b/binaries/data/mods/mod/gui/modmod/modmod.xml @@ -194,7 +194,6 @@ Cancel - closePage(); diff --git a/binaries/data/mods/mod/gui/pregame/mainmenu.js b/binaries/data/mods/mod/gui/pregame/mainmenu.js index d701e9e1f8..3d1e6b5852 100644 --- a/binaries/data/mods/mod/gui/pregame/mainmenu.js +++ b/binaries/data/mods/mod/gui/pregame/mainmenu.js @@ -1,6 +1,7 @@ -function init() +async function init() { - Engine.SwitchGuiPage("page_modmod.xml", { - "cancelbutton": false - }); + return { [Engine.openRequest]: { + "page": "page_modmod.xml", + "argument": { "cancelbutton": false } + } }; }