From 14e9c8954c051c583a33f54ecf1e997c8c03db35 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Fri, 16 Feb 2024 09:54:55 +0100
Subject: [PATCH] cellMusic

---
 rpcs3/Emu/Cell/Modules/cellMusic.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/Emu/Cell/Modules/cellMusic.cpp
index c6f664a06e..c517fe344d 100644
--- a/rpcs3/Emu/Cell/Modules/cellMusic.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellMusic.cpp
@@ -250,7 +250,7 @@ error_code cellMusicGetSelectionContext(vm::ptr<CellMusicSelectionContext> conte
 
 	if (!music.current_selection_context)
 	{
-		return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT;
+		return CELL_MUSIC_ERROR_NO_ACTIVE_CONTENT;
 	}
 
 	*context = music.current_selection_context.get();
@@ -325,7 +325,7 @@ error_code cellMusicGetContentsId(vm::ptr<CellSearchContentId> contents_id)
 
 	if (!music.current_selection_context)
 	{
-		return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT;
+		return CELL_MUSIC_ERROR_NO_ACTIVE_CONTENT;
 	}
 
 	return music.current_selection_context.find_content_id(contents_id);
@@ -408,6 +408,12 @@ error_code cellMusicGetContentsId2(vm::ptr<CellSearchContentId> contents_id)
 	// HACKY
 	auto& music = g_fxo->get<music_state>();
 	std::lock_guard lock(music.mtx);
+
+	if (!music.current_selection_context)
+	{
+		return CELL_MUSIC2_ERROR_NO_ACTIVE_CONTENT;
+	}
+
 	return music.current_selection_context.find_content_id(contents_id);
 }