actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add some nullptr handling

Browse Source
This commit is contained in:
Crash Cringle
2025-03-03 23:25:32 -08:00
committed by teejusb
parent ac767b3ce8
commit 53a26f2fa4
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+2 -2
View File
@@ -477,7 +477,7 @@ bool Song::ReloadFromSongDir( RString sDir )
return false; return false;
copy.RemoveAutoGenNotes(); copy.RemoveAutoGenNotes();
*this = copy; *this = copy;
m_SongTiming.m_fBeat0GroupOffsetInSeconds = SONGMAN->GetGroupFromName(m_sGroupName)->GetSyncOffset(); m_SongTiming.m_fBeat0GroupOffsetInSeconds = SONGMAN->GetGroup(this)->GetSyncOffset();
/* Go through the steps, first setting their Song pointer to this song /* Go through the steps, first setting their Song pointer to this song
* (instead of the copy used above), and constructing a map to let us * (instead of the copy used above), and constructing a map to let us
@@ -493,7 +493,7 @@ bool Song::ReloadFromSongDir( RString sDir )
// Reapply the Group Offset if the steps have their own timing data. // Reapply the Group Offset if the steps have their own timing data.
if( mNewSteps[id]->m_Timing.empty() ) if( mNewSteps[id]->m_Timing.empty() )
continue; continue;
mNewSteps[id]->m_Timing.m_fBeat0GroupOffsetInSeconds = SONGMAN->GetGroupFromName(m_sGroupName)->GetSyncOffset(); mNewSteps[id]->m_Timing.m_fBeat0GroupOffsetInSeconds = SONGMAN->GetGroup(this)->GetSyncOffset();
} }
// Now we wipe out the new pointers, which were shallow copied and not deep copied... // Now we wipe out the new pointers, which were shallow copied and not deep copied...
src/SongManager.cpp
+6
View File
@@ -581,6 +581,11 @@ bool SongManager::IsGroupNeverCached(const RString& group) const
RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) const RString SongManager::GetSongGroupBannerPath( RString sSongGroup ) const
{ {
Group* group = GetGroupFromName(sSongGroup); Group* group = GetGroupFromName(sSongGroup);
if(group == nullptr)
{
ASSERT_M( 0, ssprintf("requested banner for song group '%s' that doesn't exist",sSongGroup.c_str()) );
return RString();
}
return group->GetBannerPath(); return group->GetBannerPath();
} }
/* /*
@@ -613,6 +618,7 @@ bool SongManager::HasPackIni(RString sSongGroup) const
{ {
return group->HasPackIni(); return group->HasPackIni();
} }
ASSERT_M( 0, ssprintf("requested pack.ini for song group '%s' that doesn't exist",sSongGroup.c_str()) );
return false; return false;
} }