From f89d44baa388812e7a2bd0373357669a67291b42 Mon Sep 17 00:00:00 2001 From: Daniel Scharrer Date: Thu, 12 Aug 2021 22:38:30 +0200 Subject: [PATCH] Texture: Don't try to apply color key if image failed to load Fixes: issue #1557 (cherry picked from commit e5ba607d91f03bd6e87dc8eda9a5147a4cbc7726) --- src/graphics/texture/Texture.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/graphics/texture/Texture.cpp b/src/graphics/texture/Texture.cpp index 99349cb63f..689ed5c811 100644 --- a/src/graphics/texture/Texture.cpp +++ b/src/graphics/texture/Texture.cpp @@ -58,11 +58,11 @@ bool Texture::restore() { m_image.load(getFileName()); - if((m_flags & ApplyColorKey) && !m_image.hasAlpha()) { + if(m_image.isValid() && (m_flags & ApplyColorKey) && !m_image.hasAlpha()) { m_image.applyColorKeyToAlpha(Color::black, config.video.colorkeyAntialiasing); } - if(isIntensity()) { + if(m_image.isValid() && isIntensity()) { m_image.toGrayscale(); }