Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8784 from JosJuice/memory-size-mismatch
Don't assume fixed width for "Emulated memory size mismatch!" message
  • Loading branch information
leoetlino committed May 2, 2020
2 parents 66c91b9 + b7db7eb commit c72b183
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Source/Core/Core/FifoPlayer/FifoDataFile.cpp
Expand Up @@ -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,
Expand Down

0 comments on commit c72b183

Please sign in to comment.