From c3f9cf9a641f6e8a1665b4f0f3fc30734a54b533 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 25 Feb 2025 20:01:33 -0600 Subject: [PATCH] [studio] Fix New Project opening project, disable New if no project open --- src/olympic/studio/applib/src/studioui.cpp | 2 +- src/olympic/studio/modlib/src/project.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/olympic/studio/applib/src/studioui.cpp b/src/olympic/studio/applib/src/studioui.cpp index a9744443..e3e3beb0 100644 --- a/src/olympic/studio/applib/src/studioui.cpp +++ b/src/olympic/studio/applib/src/studioui.cpp @@ -156,7 +156,7 @@ void StudioUI::draw() noexcept { void StudioUI::drawMenu() noexcept { if (ImGui::BeginMainMenuBar()) { if (ImGui::BeginMenu("File")) { - if (ImGui::MenuItem("New...", "Ctrl+N")) { + if (ImGui::MenuItem("New...", "Ctrl+N", false, m_project)) { m_newMenu.open(); } if (ImGui::MenuItem("New Project...", "Ctrl+Shift+N")) { diff --git a/src/olympic/studio/modlib/src/project.cpp b/src/olympic/studio/modlib/src/project.cpp index c4cde1cc..9220d742 100644 --- a/src/olympic/studio/modlib/src/project.cpp +++ b/src/olympic/studio/modlib/src/project.cpp @@ -84,10 +84,11 @@ ox::FileSystem &Project::romFs() noexcept { } ox::Error Project::mkdir(ox::StringViewCR path) const noexcept { - auto const [stat, err] = m_fs.stat(path); + auto [stat, err] = m_fs.stat(path); if (err) { OX_RETURN_ERROR(m_fs.mkdir(path, true)); dirAdded.emit(path); + OX_RETURN_ERROR(m_fs.stat(path).moveTo(stat)); } return stat.fileType == ox::FileType::Directory ? ox::Error{} : ox::Error{1, "path exists as normal file"};