Merge pull request #244 from MadDeCoDeR/frappedia

MadDeCoDeR · web-flow · commit eb437de11118 · 2025-11-22T01:46:30.000+02:00
Merge latest commit by the Admin
diff --git a/doomclassic/doom/i_sound_openal.cpp b/doomclassic/doom/i_sound_openal.cpp
@@ -969,8 +969,10 @@ bool I_LoadSong( const char * songname )
 				});
 			if (resIt != ::g->trackMaps.end()) {
 				lumpName = musType == 1 ? (*resIt)->MIDI : (*resIt)->Remixed;
-				musFile = static_cast<unsigned char*>(W_LoadLumpName(lumpName));
-				mus_size = W_LumpLength(W_CheckNumForName(lumpName.c_str()));
+				if (idStr::Cmp(lumpName, "")) {
+					musFile = static_cast<unsigned char*>(W_LoadLumpName(lumpName));
+					mus_size = W_LumpLength(W_CheckNumForName(lumpName.c_str()));
+				}
 			}
 		}
 		delete(md_buff);

Original file line number	Diff line number	Diff line change
`@@ -969,8 +969,10 @@ bool I_LoadSong( const char * songname )`
`969`	`969`	`});`
`970`	`970`	`if (resIt != ::g->trackMaps.end()) {`
`971`	`971`	`lumpName = musType == 1 ? (resIt)->MIDI : (resIt)->Remixed;`
`972`		`- musFile = static_cast<unsigned char*>(W_LoadLumpName(lumpName));`
`973`		`- mus_size = W_LumpLength(W_CheckNumForName(lumpName.c_str()));`
	`972`	`+ if (idStr::Cmp(lumpName, "")) {`
	`973`	`+ musFile = static_cast<unsigned char*>(W_LoadLumpName(lumpName));`
	`974`	`+ mus_size = W_LumpLength(W_CheckNumForName(lumpName.c_str()));`
	`975`	`+ }`
`974`	`976`	`}`
`975`	`977`	`}`
`976`	`978`	`delete(md_buff);`