Skip to content

avoid static initialization order fiasco in soundman.cpp #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rftrdev merged 1 commit into from
Jan 18, 2023
Merged

avoid static initialization order fiasco in soundman.cpp #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions Standard Gaming Platform/soundman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,16 +1852,6 @@ UINT32 uiCount;
return(FALSE);
}

// Lesh modifications
// Sound debug
static struct SoundLog {
sgp::Logger_ID id;
SoundLog() {
id = sgp::Logger::instance().createLogger();
sgp::Logger::instance().connectFile(id, SndDebugFileName, true, sgp::Logger::FLUSH_ON_DELETE);
}
} s_SoundLog;

//*****************************************************************************************
// SoundLog
// Writes string into log file
Expand All @@ -1872,6 +1862,13 @@ static struct SoundLog {
//*****************************************************************************************
void SoundLog(CHAR8 *strMessage)
{
static struct SoundLog {
sgp::Logger_ID id;
SoundLog() {
id = sgp::Logger::instance().createLogger();
sgp::Logger::instance().connectFile(id, SndDebugFileName, true, sgp::Logger::FLUSH_ON_DELETE);
}
} s_SoundLog;
#ifndef USE_VFS
if ((SndDebug = fopen(SndDebugFileName, "a+t")) != NULL)
{
Expand Down