diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2010-06-03 04:55:39 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2010-06-03 04:55:39 +0000 |
| commit | e4085f0f049c0f681e3feaa97f7f0842c017ae8e (patch) | |
| tree | b04dce91280d8a771c894fcf8495473fc9e0c45b /Source/Core/DiscIO/Src/FileMonitor.cpp | |
| parent | d0c65b610c91531ff80298834bc866cf6b016fcd (diff) | |
Merge GCPadNew into Dolphin. This takes place in three segments: Core, InputCommon, and InputUICommon. From now on it can be referred to just as "GCPad".
Switch to Billiard's IniFile implementation throughout Dolphin (it's faster!!).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5579 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/FileMonitor.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/FileMonitor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/Src/FileMonitor.cpp b/Source/Core/DiscIO/Src/FileMonitor.cpp index 06f4a7b789..7bd8ec2118 100644 --- a/Source/Core/DiscIO/Src/FileMonitor.cpp +++ b/Source/Core/DiscIO/Src/FileMonitor.cpp @@ -142,7 +142,7 @@ void FindFilename(u64 offset) if (!fname || (strlen(fname) == 512))
return;
- CheckFile(fname, pFileSystem->GetFileSize(fname));
+ CheckFile(fname, (int)pFileSystem->GetFileSize(fname));
}
void Close()
|