Skip to content

Fix login scene cleanup ordering #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itayalroy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix login scene cleanup ordering #313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/source/Scenes/LoginScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,13 @@ void NewMoveLogInScene()

CCameraMove::GetInstancePtr()->SetTourMode(FALSE);

// Tear down the login scene data before asking the server for the
// account characters, otherwise a fast reply can be cleared again.
ReleaseLogoSceneData();
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Apr 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

While moving ReleaseLogoSceneData() to fix the race condition is correct, completely removing ClearCharacters() might introduce a new bug. If a player logs out from an account and logs into a different one with fewer characters, the characters from the previous account might still be displayed if they are not cleared.

It seems ClearCharacters() is necessary to ensure a clean state for the new account's character list. I'd recommend re-introducing it here, before the SendRequestCharacterList call.

Suggested change
ReleaseLogoSceneData();
ReleaseLogoSceneData();
ClearCharacters();

Copy link
Copy Markdown
Author

@itayalroy itayalroy Apr 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReleaseLogoSceneData already calls ClearCharacters so no need to call it twice


SceneFlag = CHARACTER_SCENE;
CurrentProtocolState = REQUEST_CHARACTERS_LIST;
SocketClient->ToGameServer()->SendRequestCharacterList(g_pMultiLanguage->GetLanguage());

ReleaseLogoSceneData();

ClearCharacters();
}

g_ConsoleDebug->UpdateMainScene();
Expand Down