From 6a910db46b3b3f351f9c23b1c505bb2c10f57e49 Mon Sep 17 00:00:00 2001
From: coco875 <pereira.jannin@gmail.com>
Date: Mon, 10 Nov 2025 20:58:12 +0100
Subject: Update DisplayListFactory.cpp

---
 src/factories/DisplayListFactory.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/factories/DisplayListFactory.cpp')

diff --git a/src/factories/DisplayListFactory.cpp b/src/factories/DisplayListFactory.cpp
index 4d7b8a0..f3d4636 100644
--- a/src/factories/DisplayListFactory.cpp
+++ b/src/factories/DisplayListFactory.cpp
@@ -282,9 +282,8 @@ ExportResult DListBinaryExporter::Export(std::ostream &write, std::shared_ptr<IP
             }
 
             auto ptr = w1;
-            auto overlap = GFXDOverride::GetVtxOverlap(ptr);
 
-            if(overlap.has_value()){
+            if(auto overlap = GFXDOverride::GetVtxOverlap(ptr); overlap.has_value()){
                 auto ovnode = std::get<1>(overlap.value());
                 auto path = Companion::Instance->RelativePath(std::get<0>(overlap.value()));
                 uint64_t hash = CRC64(path.c_str());
@@ -311,13 +310,7 @@ ExportResult DListBinaryExporter::Export(std::ostream &write, std::shared_ptr<IP
 
                 w0 = hash >> 32;
                 w1 = hash & 0xFFFFFFFF;
-            } else {
-                SPDLOG_WARN("Could not find vtx at 0x{:X}", ptr);
-            }
-
-            auto dec = Companion::Instance->GetSafeStringByAddr(ptr, "VTX");
-
-            if(dec.has_value()){
+            } else if(auto dec = Companion::Instance->GetSafeStringByAddr(ptr, "VTX"); dec.has_value()){
                 uint64_t hash = CRC64(dec.value().c_str());
                 if(hash == 0) {
                     throw std::runtime_error("Vtx hash is 0 for " + dec.value());
-- 
cgit v1.2.3