diff options
| author | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-02-19 18:50:01 +0000 |
|---|---|---|
| committer | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-02-19 18:50:01 +0000 |
| commit | 368cce2ec298d6ce8dc8eb7a5e861cf360f142f1 (patch) | |
| tree | 5c32c7eb2be652a22f913df77f4a6448a7ddd268 /Source/Core/Common | |
| parent | f41686e92693164d8ce56bbf4c248ba6133ce441 (diff) | |
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
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/LogManager.h | 3 | ||||
| -rw-r--r-- | Source/Core/Common/Src/SysConf.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/LogManager.h b/Source/Core/Common/Src/LogManager.h index a0aecb583e..eb5b7edff1 100644 --- a/Source/Core/Common/Src/LogManager.h +++ b/Source/Core/Common/Src/LogManager.h @@ -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; } diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp index 2836fd80fc..18a3669210 100644 --- a/Source/Core/Common/Src/SysConf.cpp +++ b/Source/Core/Common/Src/SysConf.cpp @@ -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()); } |