From b82d1bbc64bbaee9b7ec60a46c10b971d90d2de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <m.moninger.h@gmail.com>
Date: Mon, 23 Sep 2019 22:37:28 +0200
Subject: [PATCH] Fix #10015: Crash when certain images are drawn (#10016)

---
 src/openrct2/drawing/Drawing.Sprite.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp
index 769a2b07b9..15dc25f17b 100644
--- a/src/openrct2/drawing/Drawing.Sprite.cpp
+++ b/src/openrct2/drawing/Drawing.Sprite.cpp
@@ -510,7 +510,7 @@ void FASTCALL gfx_bmp_sprite_to_buffer(
 
 uint8_t* FASTCALL gfx_draw_sprite_get_palette(ImageId imageId)
 {
-    if (imageId.IsRemap())
+    if (!imageId.HasSecondary())
     {
         uint8_t palette_ref = imageId.GetRemap();
         if (!imageId.IsBlended())
@@ -529,7 +529,7 @@ uint8_t* FASTCALL gfx_draw_sprite_get_palette(ImageId imageId)
             return g1->offset;
         }
     }
-    else if (imageId.HasSecondary())
+    else
     {
         uint8_t* palette_pointer = gPeepPalette;
 
@@ -562,10 +562,6 @@ uint8_t* FASTCALL gfx_draw_sprite_get_palette(ImageId imageId)
 
         return palette_pointer;
     }
-    else
-    {
-        return nullptr;
-    }
 }
 
 void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo* dpi, ImageId imageId, int32_t x, int32_t y)