[nostalgia/gfx] Cleanup

release-notes.md

@@ -5,6 +5,7 @@
 * Fix file deletion to close file even if not active
 * Fix file copy to work when creating a copy with the name of a previously
   deleted file
+* Fix crash that could occur after switching projects
 * Make file picker popup accept on double click of a file
 * TileSheetEditor: Fix copy/cut/paste enablement when there is no selection
 * TileSheetEditor: Fix manual redo of draw actions, fix drawing to pixel 0, 0
@@ -13,8 +14,6 @@
   subsheets
 * PaletteEditor: Add RGB key shortcuts for focusing color channels
 * PaletteEditor: Add color preview to color editor
-* PaletteEditor: Make RGB key shortcuts work when color channel inputs are
-  focused
 
 # d2025.05.1
 

src/nostalgia/modules/gfx/src/gfx-gba.cpp

@@ -275,7 +275,7 @@ bool bgStatus(Context&, unsigned const bg) noexcept {
 
 void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
 	constexpr auto Bg0Status = 8;
-	const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
+	auto const mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
 	REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
 }
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp

@@ -13,7 +13,7 @@ AddSubSheetCommand::AddSubSheetCommand(
 	auto &parent = getSubSheet(m_img, m_parentIdx);
 	if (!parent.subsheets.empty()) {
 		auto idx = m_parentIdx;
-		idx.emplace_back(parent.subsheets.size());
+		idx.emplace_back(static_cast<uint32_t>(parent.subsheets.size()));
 		m_addedSheets.push_back(idx);
 	} else {
 		auto idx = m_parentIdx;

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp

@@ -194,6 +194,7 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key const key, bool const do
 void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 	setCopyEnabled(m_model.hasSelection());
 	setCutEnabled(m_model.hasSelection());
+	setPasteEnabled(m_model.hasSelection());
 	if (ig::mainWinHasFocus() && m_tool == TileSheetTool::Select) {
 		if (ImGui::IsKeyDown(ImGuiKey_ModCtrl) && !m_palPathFocused) {
 			if (ImGui::IsKeyPressed(ImGuiKey_A)) {
@@ -278,7 +279,7 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 				auto insertOnIdx = m_model.activeSubSheetIdx();
 				auto const &parent = m_model.activeSubSheet();
 				m_model.addSubsheet(insertOnIdx);
-				insertOnIdx.emplace_back(parent.subsheets.size() - 1);
+				insertOnIdx.emplace_back(static_cast<uint32_t>(parent.subsheets.size() - 1));
 				setActiveSubsheet(insertOnIdx);
 			}
 			ImGui::SameLine();

src/olympic/studio/applib/src/studioui.cpp

@@ -635,8 +635,7 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 	keel::DuplicateSet ds;
 	OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
 	if (ds.size()) {
-		ox::String msg;
+		ox::String msg{"Multiple files have the same UUID:\n"};
-		msg += "Multiple files have the same UUID:\n";
 		for (auto const &k : ds.keys()) {
 			msg += ox::sfmt("\n\t{}:\n", k.toString());
 			for (auto const &v : ds[k]) {
@@ -649,6 +648,9 @@ ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 			ox::make_unique_catch<Project>(keelCtx(m_tctx), std::move(path), m_projectDataDir)
 			        .moveTo(m_project));
 	m_sctx.project = m_project.get();
+	m_activeEditor = nullptr;
+	m_activeEditorOnLastDraw = nullptr;
+	m_activeEditorUpdatePending = nullptr;
 	turbine::setWindowTitle(
 		m_tctx, ox::sfmt("{} - {}", keelCtx(m_tctx).appName, m_project->projectPath()));
 	m_deleteConfirmation.deleteFile.connect(m_sctx.project, &Project::deleteItem);