diff options
| author | Léo Lam <leo@leolam.fr> | 2020-05-02 02:11:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 02:11:57 +0200 |
| commit | c72b18361fe2e600d7853705d098a0ae58a68205 (patch) | |
| tree | 96574d7115fc44805c23ccc98ab217877ec08fd4 /Source/Core | |
| parent | 66c91b9dfbb9f56713d8d71bd4f3dc6d6152e863 (diff) | |
| parent | b7db7ebbc7e988e70253084180d57276a3a1e14b (diff) | |
Merge pull request #8784 from JosJuice/memory-size-mismatch
Don't assume fixed width for "Emulated memory size mismatch!" message
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/FifoPlayer/FifoDataFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp index 0c2d36d10d..1ce57441ea 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp @@ -258,8 +258,8 @@ std::unique_ptr<FifoDataFile> FifoDataFile::Load(const std::string& filename, bo header.mem2_size != Memory::GetExRamSizeReal()) { CriticalAlertT("Emulated memory size mismatch!\n" - "Current | MEM1 %08X (%3dMB) MEM2 %08X (%3dMB)\n" - "DFF | MEM1 %08X (%3dMB) MEM2 %08X (%3dMB)", + "Current: MEM1 %08X (%3d MiB), MEM2 %08X (%3d MiB)\n" + "DFF: MEM1 %08X (%3d MiB), MEM2 %08X (%3d MiB)", Memory::GetRamSizeReal(), Memory::GetRamSizeReal() / 0x100000, Memory::GetExRamSizeReal(), Memory::GetExRamSizeReal() / 0x100000, header.mem1_size, header.mem1_size / 0x100000, header.mem2_size, |