From 7d0a31ef1a6a63a2b0af46fa4d0ceeae8107abf5 Mon Sep 17 00:00:00 2001
From: teejusb <5017202+teejusb@users.noreply.github.com>
Date: Sun, 23 Mar 2025 01:57:37 -0700
Subject: [PATCH] nullptr check + use const ref

---
 src/SongManager.cpp | 5 ++++-
 src/SongManager.h   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index 06120243d0..2b39e785eb 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -682,7 +682,7 @@ bool SongManager::DoesSongGroupExist( RString sSongGroup ) const
 	return find( m_sSongGroupNames.begin(), m_sSongGroupNames.end(), sSongGroup ) != m_sSongGroupNames.end();
 }
 
-bool SongManager::HasPackIni(RString sSongGroup) const
+bool SongManager::HasPackIni(const RString& sSongGroup) const
 {
 	Group* group = GetGroupFromName(sSongGroup);
 	if(group != nullptr)
@@ -937,6 +937,9 @@ std::vector<Song*> SongManager::GetPreferredSortSongsBySectionName( const RStrin
 
 Group* SongManager::GetGroup( const Song* pSong ) const
 {
+	if ( pSong == nullptr ) {
+		return nullptr;
+	}
 	return GetGroupFromName( pSong->m_sGroupName );
 }
 
diff --git a/src/SongManager.h b/src/SongManager.h
index 4b6f9fff11..d88bbc6590 100644
--- a/src/SongManager.h
+++ b/src/SongManager.h
@@ -98,7 +98,7 @@ public:
 	//RString GetSongGroupBackgroundPath( RString sSongGroup ) const;
 	void GetSongGroupNames( std::vector<RString> &AddTo ) const;
 	bool DoesSongGroupExist( RString sSongGroup ) const;
-	bool HasPackIni(RString sSongGroup) const;
+	bool HasPackIni(const RString& sSongGroup) const;
 	RageColor GetSongGroupColor( const RString &sSongGroupName ) const;
 	RageColor GetSongColor( const Song* pSong ) const;