gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Close register-page before opening login-page

Browse Source 
The `onTick` of the register-page was still running when connecting to
the lobby. This lead to an error when the `connect` message was
received.
With this commit returning from the login-page will always return to the
entrance-page. Previously it returned to the register-page when it was
opened by through that page.
This commit is contained in:
phosit
2025-12-30 18:23:43 +01:00
parent bc021863af
commit 0b83e24065
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/prelobby/common/feedback/feedback.js
+2
View File
@@ -42,4 +42,6 @@ async function cancelButton()
await new Promise(resolve => { Engine.GetGUIObjectByName("cancel").onPress = resolve; }); await new Promise(resolve => { Engine.GetGUIObjectByName("cancel").onPress = resolve; });
if (Engine.HasXmppClient()) if (Engine.HasXmppClient())
Engine.StopXmppClient(); Engine.StopXmppClient();
return false;
} }
binaries/data/mods/public/gui/prelobby/entrance/entrance.js
+3 -2
View File
@@ -13,7 +13,8 @@ function loginButton()
Engine.OpenChildPage("page_prelobby_login.xml"); Engine.OpenChildPage("page_prelobby_login.xml");
} }
function registerButton() async function registerButton()
{ {
Engine.OpenChildPage("page_prelobby_register.xml"); if (await Engine.OpenChildPage("page_prelobby_register.xml"))
Engine.OpenChildPage("page_prelobby_login.xml");
} }
binaries/data/mods/public/gui/prelobby/register/register.js
+1 -2
View File
@@ -40,6 +40,5 @@ async function onRegistered()
setFeedback(translate("Registered")); setFeedback(translate("Registered"));
Engine.StopXmppClient(); Engine.StopXmppClient();
return true;
Engine.OpenChildPage("page_prelobby_login.xml");
} }