Fix a crash when delete a sound in editor

MilkeeyCat · MilkeeyCat · commit 9ff706b2448b · 2025-01-29T23:32:14.000+02:00
diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp
@@ -1872,6 +1872,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,
 		{
 			pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);
 			pEditor->m_Map.ModifySoundIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedSound));
+			pEditor->m_ToolbarPreviewSound = -1;
 		}
 		return CUi::POPUP_CLOSE_CURRENT;
 	}
@@ -2228,6 +2229,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,
 		{
 			pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);
 			pEditor->m_Map.ModifySoundIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedSound));
+			pEditor->m_ToolbarPreviewSound = -1;
 		}
 		pEditor->m_PopupEventWasActivated = false;
 		return CUi::POPUP_CLOSE_CURRENT;

Original file line number	Diff line number	Diff line change
`@@ -1872,6 +1872,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View,`
`1872`	`1872`	`{`
`1873`	`1873`	`pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);`
`1874`	`1874`	`pEditor->m_Map.ModifySoundIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedSound));`
	`1875`	`+ pEditor->m_ToolbarPreviewSound = -1;`
`1875`	`1876`	`}`
`1876`	`1877`	`return CUi::POPUP_CLOSE_CURRENT;`
`1877`	`1878`	`}`
`@@ -2228,6 +2229,7 @@ CUi::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View,`
`2228`	`2229`	`{`
`2229`	`2230`	`pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);`
`2230`	`2231`	`pEditor->m_Map.ModifySoundIndex(gs_ModifyIndexDeleted(pEditor->m_SelectedSound));`
	`2232`	`+ pEditor->m_ToolbarPreviewSound = -1;`
`2231`	`2233`	`}`
`2232`	`2234`	`pEditor->m_PopupEventWasActivated = false;`
`2233`	`2235`	`return CUi::POPUP_CLOSE_CURRENT;`