summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-07-28 22:07:10 +0200
committerGitHub <noreply@github.com>2016-07-28 22:07:10 +0200
commite22b80b70fa4f97f5a0e0730e7a69d969b972831 (patch)
tree4d9f3d3accee4c2248dc3f2b01b0fc1320330c9e /src
parentMerge pull request #1959 from MerryMage/revsh-upstream (diff)
parentInstead of segfaulting, log an error to remind the user to dump the shared font file (diff)
downloadyuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.tar
yuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.tar.gz
yuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.tar.bz2
yuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.tar.lz
yuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.tar.xz
yuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.tar.zst
yuzu-e22b80b70fa4f97f5a0e0730e7a69d969b972831.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/apt/apt.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index 1e54a53dd..0c623d45f 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -70,6 +70,13 @@ void Initialize(Service::Interface* self) {
void GetSharedFont(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer();
+ if (!shared_font_mem) {
+ LOG_ERROR(Service_APT, "shared font file missing - go dump it from your 3ds");
+ cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2);
+ cmd_buff[1] = -1; // TODO: Find the right error code
+ return;
+ }
+
// The shared font has to be relocated to the new address before being passed to the application.
VAddr target_address = Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address);
// The shared font dumped by 3dsutils (https://github.com/citra-emu/3dsutils) uses this address as base,