mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Revert the SysConf change, since it was intended by shuffle.
Attempt to fix some of our singleton failures. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5085 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -117,9 +117,10 @@ private:
|
||||
ConsoleListener *m_consoleLog;
|
||||
static LogManager *m_logManager; // Singleton. Ugh.
|
||||
|
||||
public:
|
||||
LogManager();
|
||||
~LogManager();
|
||||
DISALLOW_COPY_AND_ASSIGN(LogManager);
|
||||
public:
|
||||
|
||||
static u32 GetMaxLevel() { return MAX_LOGLEVEL; }
|
||||
|
||||
|
@ -38,6 +38,8 @@ SysConf::~SysConf()
|
||||
if (!m_IsValid)
|
||||
return;
|
||||
|
||||
Save();
|
||||
|
||||
for (size_t i = 0; i < m_Entries.size() - 1; i++)
|
||||
{
|
||||
delete [] m_Entries.at(i).data;
|
||||
@ -169,5 +171,7 @@ bool SysConf::SaveToFile(const char *filename)
|
||||
|
||||
bool SysConf::Save()
|
||||
{
|
||||
if (!m_IsValid)
|
||||
return false;
|
||||
return SaveToFile(m_Filename.c_str());
|
||||
}
|
||||
|
Reference in New Issue
Block a user