From 36fe3c871c5567934a37911882e5e032a9b08432 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Tue, 1 Feb 2022 17:51:00 +0100
Subject: [PATCH] Fixed an issue where corrupt textures could get rendered.

---
 es-core/src/components/ImageComponent.cpp  | 4 ++--
 es-core/src/components/TextListComponent.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/es-core/src/components/ImageComponent.cpp b/es-core/src/components/ImageComponent.cpp
index 52c50d780..5253357d1 100644
--- a/es-core/src/components/ImageComponent.cpp
+++ b/es-core/src/components/ImageComponent.cpp
@@ -384,8 +384,8 @@ void ImageComponent::updateColors()
 
 void ImageComponent::render(const glm::mat4& parentTrans)
 {
-    if (!isVisible() || mTexture == nullptr ||
-        (mTargetSize == glm::vec2 {0.0f, 0.0f} && mSize == glm::vec2 {0.0f, 0.0f}))
+    if (!isVisible() || mTexture == nullptr || mTargetSize == glm::vec2 {0.0f, 0.0f} ||
+        mSize == glm::vec2 {0.0f, 0.0f})
         return;
 
     glm::mat4 trans {parentTrans * getTransform()};
diff --git a/es-core/src/components/TextListComponent.h b/es-core/src/components/TextListComponent.h
index 34ce13a79..1ac6bb6c3 100644
--- a/es-core/src/components/TextListComponent.h
+++ b/es-core/src/components/TextListComponent.h
@@ -485,6 +485,7 @@ void TextListComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
         bool tile = elem->has("selectorImageTile") && elem->get<bool>("selectorImageTile");
         mSelectorImage.setImage(path, tile);
         mSelectorImage.setSize(mSize.x, mSelectorHeight);
+        mSelectorImage.setResize(mSize.x, mSelectorHeight);
         mSelectorImage.setColorShift(mSelectorColor);
         mSelectorImage.setColorShiftEnd(mSelectorColorEnd);
     }