mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-06-28 09:59:32 -06:00
Merge pull request #13737 from LillyJadeKatrin/retroachievements-gamecube-bulk-fix
AchievementManager - Fix Gamecube Bulk Copy
This commit is contained in:
@ -338,11 +338,12 @@ void AchievementManager::DoFrame()
|
|||||||
if (!system)
|
if (!system)
|
||||||
return;
|
return;
|
||||||
Core::CPUThreadGuard thread_guard(*system);
|
Core::CPUThreadGuard thread_guard(*system);
|
||||||
u32 mem2_size = system->GetMemory().GetExRamSizeReal();
|
u32 mem2_size = (system->IsWii()) ? system->GetMemory().GetExRamSizeReal() : 0;
|
||||||
if (m_cloned_memory.size() != MEM1_SIZE + mem2_size)
|
if (m_cloned_memory.size() != MEM1_SIZE + mem2_size)
|
||||||
m_cloned_memory.resize(MEM1_SIZE + mem2_size);
|
m_cloned_memory.resize(MEM1_SIZE + mem2_size);
|
||||||
system->GetMemory().CopyFromEmu(m_cloned_memory.data(), 0, MEM1_SIZE);
|
system->GetMemory().CopyFromEmu(m_cloned_memory.data(), 0, MEM1_SIZE);
|
||||||
system->GetMemory().CopyFromEmu(m_cloned_memory.data() + MEM1_SIZE, MEM2_START, mem2_size);
|
if (mem2_size > 0)
|
||||||
|
system->GetMemory().CopyFromEmu(m_cloned_memory.data() + MEM1_SIZE, MEM2_START, mem2_size);
|
||||||
}
|
}
|
||||||
#endif // RC_CLIENT_SUPPORTS_RAINTEGRATION
|
#endif // RC_CLIENT_SUPPORTS_RAINTEGRATION
|
||||||
std::lock_guard lg{m_lock};
|
std::lock_guard lg{m_lock};
|
||||||
|
Reference in New Issue
Block a user