diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2011-04-01 07:43:02 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2011-04-01 07:43:02 +0000 |
| commit | 021193b22f93bd77da407e79672a74f08b3eceba (patch) | |
| tree | 2e4be14387616494551352b8d57b9c8360b608dd /Source/Core/DiscIO/Src/FileMonitor.cpp | |
| parent | 7a9a47376f9540d99393c0369c5f5c1a9188db53 (diff) | |
Use mutexes in LogManager to make it threadsafe, as suggested by beistin's patch. Change some LogManager function names to be consistent with Dolphin's naming conventions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7433 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/FileMonitor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileMonitor.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/Src/FileMonitor.cpp b/Source/Core/DiscIO/Src/FileMonitor.cpp index 822c010364..4c23df182d 100644 --- a/Source/Core/DiscIO/Src/FileMonitor.cpp +++ b/Source/Core/DiscIO/Src/FileMonitor.cpp @@ -93,9 +93,11 @@ void ReadGC(std::string FileName) void CheckFile(std::string File, u64 Size) { // Don't do anything if the log is unselected - if (!LogManager::GetInstance()->isEnable(LogTypes::FILEMON)) return; + if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON)) + return; // Do nothing if we found the same file again - if (CurrentFile == File) return; + if (CurrentFile == File) + return; if (Size > 0) Size = (Size / 1000); std::string Str = StringFromFormat("%s kB %s", ThousandSeparate(Size, 7).c_str(), File.c_str()); @@ -119,7 +121,7 @@ void FindFilename(u64 offset) // Don't do anything if a game is not running if (Core::GetState() != Core::CORE_RUN) return; // Or if the log is unselected - if (!LogManager::GetInstance()->isEnable(LogTypes::FILEMON)) return; + if (!LogManager::GetInstance()->IsEnabled(LogTypes::FILEMON)) return; if (!FileAccess) return; if (!pFileSystem || ISOFile != SConfig::GetInstance().m_LastFilename) |