From e70b049887e83b429b70aca01652e50020271b8f Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 5 Oct 2022 11:10:38 -0400
Subject: [PATCH] Remove unnecessary null checks

---
 src/ui/imageproviders.cpp                | 3 +--
 src/ui/tileseteditormetatileselector.cpp | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ui/imageproviders.cpp b/src/ui/imageproviders.cpp
index 6a246cc9..de81da68 100644
--- a/src/ui/imageproviders.cpp
+++ b/src/ui/imageproviders.cpp
@@ -23,8 +23,7 @@ QImage getMetatileImage(
         bool useTruePalettes)
 {
     Metatile* metatile = Tileset::getMetatile(metatileId, primaryTileset, secondaryTileset);
-    Tileset* blockTileset = Tileset::getMetatileTileset(metatileId, primaryTileset, secondaryTileset);
-    if (!metatile || !blockTileset) {
+    if (!metatile) {
         QImage metatile_image(16, 16, QImage::Format_RGBA8888);
         metatile_image.fill(Qt::magenta);
         return metatile_image;
diff --git a/src/ui/tileseteditormetatileselector.cpp b/src/ui/tileseteditormetatileselector.cpp
index 1f3a19b0..1fd20456 100644
--- a/src/ui/tileseteditormetatileselector.cpp
+++ b/src/ui/tileseteditormetatileselector.cpp
@@ -52,9 +52,6 @@ QImage TilesetEditorMetatileSelector::buildImage(int metatileIdStart, int numMet
 }
 
 void TilesetEditorMetatileSelector::draw() {
-    if (!this->primaryTileset || !this->secondaryTileset) {
-        this->setPixmap(QPixmap());
-    }
     this->setPixmap(QPixmap::fromImage(this->buildAllMetatilesImage()));
     this->drawSelection();