From 982ce48ff49204fb28094d1dabcf62e3b5c07ac6 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Mon, 22 Jan 2024 21:17:55 -0500
Subject: [PATCH] Update ScreenEditor load order

---
 src/app/editor/screen_editor.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/editor/screen_editor.cc b/src/app/editor/screen_editor.cc
index d0a23bf0..85d82bfc 100644
--- a/src/app/editor/screen_editor.cc
+++ b/src/app/editor/screen_editor.cc
@@ -29,7 +29,11 @@ ScreenEditor::ScreenEditor() { screen_canvas_.SetCanvasSize(ImVec2(512, 512)); }
 
 void ScreenEditor::Update() {
   TAB_BAR("##TabBar")
-  DrawDungeonMapsEditor();
+  TAB_ITEM("Dungeon Maps")
+  if (rom()->is_loaded()) {
+    DrawDungeonMapsEditor();
+  }
+  END_TAB_ITEM()
   DrawInventoryMenuEditor();
   DrawOverworldMapEditor();
   DrawTitleScreenEditor();
@@ -323,7 +327,7 @@ void ScreenEditor::DrawDungeonMapsTabs() {
 }
 
 void ScreenEditor::DrawDungeonMapsEditor() {
-  if (rom()->is_loaded() && !dungeon_maps_loaded_) {
+  if (!dungeon_maps_loaded_) {
     if (LoadDungeonMaps().ok()) {
       if (LoadDungeonMapTile16().ok()) {
         auto bitmap_manager = rom()->mutable_bitmap_manager();
@@ -333,10 +337,10 @@ void ScreenEditor::DrawDungeonMapsEditor() {
         sheets_.emplace(3, *bitmap_manager->mutable_bitmap(215));
         dungeon_maps_loaded_ = true;
       } else {
-        throw std::runtime_error("Failed to load dungeon map tile16");
+        ImGui::Text("Failed to load dungeon map tile16");
       }
     } else {
-      throw std::runtime_error("Failed to load dungeon maps");
+      ImGui::Text("Failed to load dungeon maps");
     }
   }
 
@@ -347,8 +351,6 @@ void ScreenEditor::DrawDungeonMapsEditor() {
       "Thieves' Town",      "Ice Palace",    "Misery Mire",
       "Turtle Rock",        "Ganon's Tower"};
 
-  TAB_ITEM("Dungeon Maps")
-
   if (ImGui::BeginTable("DungeonMapsTable", 4, ImGuiTableFlags_Resizable)) {
     ImGui::TableSetupColumn("Dungeon");
     ImGui::TableSetupColumn("Map");
@@ -393,8 +395,6 @@ void ScreenEditor::DrawDungeonMapsEditor() {
 
     ImGui::EndTable();
   }
-
-  END_TAB_ITEM()
 }
 
 void ScreenEditor::DrawTitleScreenEditor() {