@@ -846,13 +846,13 @@ bool MidiFile::LoadMpsData(const byte *d
}
bool MidiFile::LoadSong(const MusicSongInfo &song)
{
switch (song.filetype) {
case MTT_STANDARDMIDI:
return this->LoadFile(song.filename);
return this->LoadFile(song.filename.c_str());
case MTT_MPSMIDI:
size_t songdatalen = 0;
byte *songdata = GetMusicCatEntryData(song.filename, song.cat_index, songdatalen);
if (songdata != nullptr) {
bool result = this->LoadMpsData(songdata, songdatalen);
@@ -1057,15 +1057,15 @@ std::string MidiFile::GetSMFFile(const M
if (song.filetype != MTT_MPSMIDI) return std::string();
char basename[MAX_PATH];
const char *fnstart = strrchr(song.filename, PATHSEPCHAR);
const char *fnstart = strrchr(song.filename.c_str(), PATHSEPCHAR);
if (fnstart == nullptr) {
fnstart = song.filename;
fnstart = song.filename.c_str();
} else {
fnstart++;
/* Remove all '.' characters from filename */
char *wp = basename;