From 61b39296e13fbe6dc9d1f5075534713189bbe15e Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 6 Jul 2024 13:34:44 +0100 Subject: [PATCH] Fix crash when replacing recolour sprite with normal sprite See: #712 --- src/spritecache.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/spritecache.cpp b/src/spritecache.cpp index a869171f6f..6d9c720beb 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -752,14 +752,13 @@ bool LoadNextSprite(int load_index, SpriteFile &file, uint file_sprite_id) } SpriteCache *sc = AllocateSpriteCache(load_index); + sc->Clear(); // Clear existing entry before changing type field sc->file = &file; sc->file_pos = file_pos; sc->SetType(type); if (data != nullptr) { assert(data == _last_sprite_allocation.GetPtr()); sc->Assign(std::move(_last_sprite_allocation)); - } else { - sc->Clear(); } sc->id = file_sprite_id; sc->count = count;