AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-11 00:26:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix if you try to sign in multiple times very quickly, you'd go to the server list, but trying to start the game would show 'error: missing IP and/or port' (Thanks 123DMWM)

Browse Source 
One way to trigger this was to click 'sign in' at MFA required menu, then click 'sign in' again on the main launcher menu.

It could also be triggered by clicking Sign In, then very quickly clicking Options then Back, then clicking Sign In again.
This commit is contained in:
UnknownShadow200 2020-10-05 11:33:34 +11:00
parent 1758667f1d
commit ae2443bb91
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LScreens.c
View File

@ -1,4 +1,5 @@
#include "LScreens.h"
#ifndef CC_BUILD_WEB
#include "LWidgets.h"
#include "LWeb.h"
#include "Launcher.h"
@ -13,8 +14,8 @@
#include "Window.h"
#include "Input.h"
#include "Options.h"
#include "Game.h"
#ifndef CC_BUILD_WEB
/*########################################################################################################################*
*---------------------------------------------------------Screen base-----------------------------------------------------*
*#########################################################################################################################*/
@ -918,6 +919,7 @@ static void MainScreen_TickSignIn(struct MainScreen* s) {
LInput_SetText(&s->iptUsername, &SignInTask.username);
LWidget_Redraw(&s->iptUsername);
}
String_Copy(&Game_Username, &SignInTask.username);
FetchServersTask_Run();
LLabel_SetConst(&s->lblStatus, "&eRetrieving servers list..");

2
src/LWeb.c
View File

@ -1,4 +1,5 @@
#include "LWeb.h"
#ifndef CC_BUILD_WEB
#include "Launcher.h"
#include "Platform.h"
#include "Stream.h"
@ -8,7 +9,6 @@
#include "PackedCol.h"
#include "Errors.h"
#ifndef CC_BUILD_WEB
/*########################################################################################################################*
*----------------------------------------------------------JSON-----------------------------------------------------------*
*#########################################################################################################################*/

2
src/LWidgets.c
View File

@ -1,4 +1,5 @@
#include "LWidgets.h"
#ifndef CC_BUILD_WEB
#include "Gui.h"
#include "Drawer2D.h"
#include "Launcher.h"
@ -10,7 +11,6 @@
#include "LScreens.h"
#include "Input.h"
#ifndef CC_BUILD_WEB
static int xBorder, xBorder2, xBorder3, xBorder4;
static int yBorder, yBorder2, yBorder3, yBorder4;
static int xInputOffset, yInputOffset, inputExpand;

4
src/Launcher.c
View File

@ -1,4 +1,5 @@
#include "Launcher.h"
#ifndef CC_BUILD_WEB
#include "LScreens.h"
#include "LWidgets.h"
#include "LWeb.h"
@ -17,7 +18,6 @@
#include "Logger.h"
#include "Options.h"
#ifndef CC_BUILD_WEB
static struct LScreen* activeScreen;
Rect2D Launcher_Dirty;
struct Bitmap Launcher_Framebuffer;
@ -117,7 +117,7 @@ CC_NOINLINE static void StartFromInfo(struct ServerInfo* info) {
String_InitArray(port, portBuffer);
String_AppendInt(&port, info->port);
Launcher_StartGame(&SignInTask.username, &info->mppass, &info->ip, &port, &info->name);
Launcher_StartGame(&Game_Username, &info->mppass, &info->ip, &port, &info->name);
}
cc_bool Launcher_ConnectToServer(const String* hash) {

2
src/Resources.c
View File

@ -1,4 +1,5 @@
#include "Resources.h"
#ifndef CC_BUILD_WEB
#include "Funcs.h"
#include "String.h"
#include "Constants.h"
@ -12,7 +13,6 @@
#include "Logger.h"
#include "LWeb.h"
#ifndef CC_BUILD_WEB
/*########################################################################################################################*
*--------------------------------------------------------Resources list---------------------------------------------------*
*#########################################################################################################################*/