From daad7a47314d03ea9bbef39d68459ce638df37fc Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 31 Dec 2024 17:40:41 -0500 Subject: [PATCH] Improve error handling in LoadBinaryGfx by checking palette application status before rendering --- src/app/editor/graphics/screen_editor.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/editor/graphics/screen_editor.cc b/src/app/editor/graphics/screen_editor.cc index 37252de2..52e430b4 100644 --- a/src/app/editor/graphics/screen_editor.cc +++ b/src/app/editor/graphics/screen_editor.cc @@ -560,8 +560,10 @@ void ScreenEditor::LoadBinaryGfx() { gfx_sheets.emplace_back(converted_bin.begin() + (i * 0x1000), converted_bin.begin() + ((i + 1) * 0x1000)); sheets_.emplace(i, gfx::Bitmap(128, 32, 8, gfx_sheets[i])); - sheets_[i].ApplyPalette(*rom()->mutable_dungeon_palette(3)); - Renderer::GetInstance().RenderBitmap(&sheets_[i]); + status_ = sheets_[i].ApplyPalette(*rom()->mutable_dungeon_palette(3)); + if (status_.ok()) { + Renderer::GetInstance().RenderBitmap(&sheets_[i]); + } } binary_gfx_loaded_ = true; } else {