diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc index 27b8b290..433b83e7 100644 --- a/src/app/editor/editor_manager.cc +++ b/src/app/editor/editor_manager.cc @@ -435,7 +435,7 @@ void EditorManager::DrawMenuContent() { if (rom()->is_loaded()) { MENU_ITEM("Close") { - status_ = rom()->Close(); + rom()->Close(); rom_assets_loaded_ = false; } } @@ -705,20 +705,6 @@ void EditorManager::DrawMenuContent() { } } -void EditorManager::DrawRomMenu() { - if (roms_.empty()) return; - - // Dropdown in the center of the menu bar with ROMs - if (BeginMenu("ROM")) { - for (size_t i = 0; i < roms_.size(); ++i) { - if (MenuItem(roms_[i]->title().c_str())) { - current_rom_ = roms_[i].get(); - } - } - EndMenu(); - } -} - void EditorManager::LoadRom() { auto file_name = FileDialogWrapper::ShowOpenFileDialog(); auto load_rom = rom()->LoadFromFile(file_name); diff --git a/src/app/editor/editor_manager.h b/src/app/editor/editor_manager.h index e5000869..557ddcda 100644 --- a/src/app/editor/editor_manager.h +++ b/src/app/editor/editor_manager.h @@ -68,7 +68,6 @@ class EditorManager : public SharedRom { void DrawMenuBar(); void DrawMenuContent(); - void DrawRomMenu(); void LoadRom(); void SaveRom(); diff --git a/src/app/rom.h b/src/app/rom.h index 8b80bc98..bbe9d5ba 100644 --- a/src/app/rom.h +++ b/src/app/rom.h @@ -104,11 +104,10 @@ class Rom { size_ = size; } - absl::Status Close() { + void Close() { rom_data_.clear(); size_ = 0; is_loaded_ = false; - return absl::OkStatus(); } absl::StatusOr ReadByte(int offset);