mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/ui: copy a slice at SetIconImages

Browse Source 
This changes makes ebiten.SetIconImages a little safer.
This commit is contained in:
Hajime Hoshi 2023-09-30 01:45:58 +09:00
parent 7204ca86e3
commit 13dfb28a98
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/ui/ui_glfw.go
View File

@ -394,17 +394,19 @@ func (u *userInterfaceImpl) setRunnableOnUnfocused(runnableOnUnfocused bool) {
u.m.Unlock()
}
func (u *userInterfaceImpl) getIconImages() []image.Image {
func (u *userInterfaceImpl) getAndResetIconImages() []image.Image {
u.m.RLock()
i := u.iconImages
u.m.RUnlock()
return i
defer u.m.RUnlock()
s := u.iconImages
u.iconImages = nil
return s
}
func (u *userInterfaceImpl) setIconImages(iconImages []image.Image) {
u.m.Lock()
u.iconImages = iconImages
u.m.Unlock()
defer u.m.Unlock()
u.iconImages = make([]image.Image, len(iconImages))
copy(u.iconImages, iconImages)
}
func (u *userInterfaceImpl) getInitWindowPositionInDIP() (int, int) {
@ -1201,13 +1203,11 @@ func (u *userInterfaceImpl) updateIconIfNeeded() error {
return nil
}
imgs := u.getIconImages()
imgs := u.getAndResetIconImages()
if len(imgs) == 0 {
return nil
}
u.setIconImages(nil)
newImgs := make([]image.Image, len(imgs))
for i, img := range imgs {
// TODO: If img is not *ebiten.Image, this converting is not necessary.