diff options
| author | bunnei <bunneidev@gmail.com> | 2015-08-27 19:43:55 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-08-27 19:43:55 -0400 |
| commit | 2978b5fbc8fe7d5bd0824aa6a5c97cb5237e0305 (patch) | |
| tree | 1c9a5352790d3fea47582013ad5a160781f59cf8 /src/core/hle/service | |
| parent | c5a4025b6581c1c64c2761d09510c5827eaada05 (diff) | |
| parent | 12390eb155c055884f183cc547473a1dd92ff667 (diff) | |
Merge pull request #1075 from yuriks/ControlMem-fixes
Fix heap-management regressions
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/apt/apt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp index 6a2fdea2b..ba66569b4 100644 --- a/src/core/hle/service/apt/apt.cpp +++ b/src/core/hle/service/apt/apt.cpp @@ -78,8 +78,8 @@ void GetSharedFont(Service::Interface* self) { if (shared_font != nullptr) { // TODO(yuriks): This is a hack to keep this working right now even with our completely // broken shared memory system. - shared_font_mem->base_address = SHARED_FONT_VADDR; - Kernel::g_current_process->vm_manager.MapMemoryBlock(shared_font_mem->base_address, + shared_font_mem->fixed_address = SHARED_FONT_VADDR; + Kernel::g_current_process->vm_manager.MapMemoryBlock(shared_font_mem->fixed_address, shared_font, 0, shared_font_mem->size, Kernel::MemoryState::Shared); cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2); |