Skip to content

fix: Prevent crashes caused by client_entergame and other minor bugs. #736

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

Merged
Nottinghster merged 3 commits into from
Apr 3, 2024
Merged

fix: Prevent crashes caused by client_entergame and other minor bugs. #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46542fc
fix: crash game_entergame if httpLoginBox is boolean ( #647 )
kokekanon Mar 31, 2024
fe1ccd7
fix: game_entergame if host nil windows is hidden
kokekanon Mar 31, 2024
5167201
temp fix: game_entergame windows is not centered
kokekanon Mar 31, 2024
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
14 changes: 12 additions & 2 deletions modules/client_entergame/entergame.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,11 @@ function EnterGame.setPassword(password)
end

function EnterGame.setHttpLogin(httpLogin)
enterGame:getChildById('httpLoginBox'):setChecked(#httpLogin > 0)
if type(httpLogin) == "boolean" then
enterGame:getChildById('httpLoginBox'):setChecked(httpLogin)
else
enterGame:getChildById('httpLoginBox'):setChecked(#httpLogin > 0)
end
end

function EnterGame.clearAccountFields()
Expand Down Expand Up @@ -494,7 +498,13 @@ function EnterGame.doLogin()
protocolLogin.onCharacterList = onCharacterList
protocolLogin.onUpdateNeeded = onUpdateNeeded

loadBox = displayCancelBox(tr('Please wait'), tr('Connecting to login server...'))
if not host then
loadBox = displayCancelBox(tr('Please wait'), tr('ERROR , try adding \n- ip/login.php \n- Enable HTTP login'))
else
loadBox = displayCancelBox(tr('Please wait'), tr('Connecting to login server...\nServer: [%s]',
host .. ":" .. tostring(G.port) .. path))
end

connect(loadBox, {
onCancel = function(msgbox)
loadBox = nil
Expand Down
1 change: 0 additions & 1 deletion modules/client_entergame/entergame.otui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
EnterGameWindow < MainWindow
!text: tr('Enter Game')
size: 236 316
draggable: false

EnterGameButton < Button
width: 64
Expand Down