diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index e6661158..d4214f3f 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -313,17 +313,7 @@ void MasterEditor::DrawFileMenu() { if (BeginMenu("File")) { if (MenuItem("Open", "Ctrl+O")) { - if (flags()->kNewFileDialogWrapper) { - auto file_name = FileDialogWrapper::ShowOpenFileDialog(); - PRINT_IF_ERROR(rom()->LoadFromFile(file_name)); - static RecentFilesManager manager("recent_files.txt"); - manager.Load(); - manager.AddFile(file_name); - manager.Save(); - } else { - ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Open ROM", - ".sfc,.smc", "."); - } + LoadRom(); } if (BeginMenu("Open Recent")) { @@ -609,6 +599,20 @@ void MasterEditor::DrawHelpMenu() { } } +void MasterEditor::LoadRom() { + if (flags()->kNewFileDialogWrapper) { + auto file_name = FileDialogWrapper::ShowOpenFileDialog(); + PRINT_IF_ERROR(rom()->LoadFromFile(file_name)); + static RecentFilesManager manager("recent_files.txt"); + manager.Load(); + manager.AddFile(file_name); + manager.Save(); + } else { + ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Open ROM", + ".sfc,.smc", "."); + } +} + void MasterEditor::SaveRom() { if (flags()->kSaveDungeonMaps) { status_ = screen_editor_.SaveDungeonMaps(); diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h index cec820bc..c3a6f1fb 100644 --- a/src/app/editor/master_editor.h +++ b/src/app/editor/master_editor.h @@ -75,6 +75,7 @@ class MasterEditor : public SharedRom, void DrawViewMenu(); void DrawHelpMenu(); + void LoadRom(); void SaveRom(); bool about_ = false;