diff --git a/d2game/d2gamescreen/character_select.go b/d2game/d2gamescreen/character_select.go index 3c951568..d64a0f08 100644 --- a/d2game/d2gamescreen/character_select.go +++ b/d2game/d2gamescreen/character_select.go @@ -47,6 +47,7 @@ type CharacterSelect struct { tickTimer float64 storedTickTimer float64 showDeleteConfirmation bool + loaded bool connectionType d2clientconnectiontype.ClientConnectionType connectionHost string @@ -195,6 +196,7 @@ func (v *CharacterSelect) OnLoad(loading d2screen.LoadingState) { } v.refreshGameStates() + v.loaded = true } func (v *CharacterSelect) loadBackground() { @@ -421,6 +423,10 @@ func (v *CharacterSelect) moveSelectionBox() { // OnMouseButtonDown is called when a mouse button is clicked func (v *CharacterSelect) OnMouseButtonDown(event d2interface.MouseEvent) bool { + if !v.loaded { + return false + } + if v.showDeleteConfirmation { return false } @@ -547,5 +553,7 @@ func (v *CharacterSelect) OnUnload() error { return err } + v.loaded = false + return nil }