drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 646ab128..ab11b885

Browse Source 
ab11b885 [keel] Add missing new line to log message
36fc25fb [studio] Fix closing tab with unsaved changes
4803cca3 [nostalgia/player] Cleanup
6bd74611 [nostalgia] Update release notes
c3f9cf9a [studio] Fix New Project opening project, disable New if no project open

git-subtree-dir: deps/nostalgia
git-subtree-split: ab11b885e680ee8f0be7ee06f2253ab7ddb726be
This commit is contained in:
Gary Talent
2025-03-27 00:22:14 -05:00
parent 54de52e6c5
commit 6bcd6deb76
6 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/olympic/studio/applib/src/studioui.cpp
View File

@@ -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")) {
@@ -254,6 +254,7 @@ void StudioUI::drawTabs() noexcept {
if (!open) {
if (e->unsavedChanges()) {
m_closeFileConfirm.open();
++it;
} else {
e->close();
if (m_activeEditor == (*it).get()) {

3
src/olympic/studio/modlib/src/project.cpp
View File

@@ -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"};