summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydgard <hrydgard@gmail.com>2016-07-28 21:47:31 +0200
committerHenrik Rydgard <hrydgard@gmail.com>2016-07-28 21:47:57 +0200
commit9a9e9dc375163090394e212a11e6f58379dc9a90 (patch)
tree4d9f3d3accee4c2248dc3f2b01b0fc1320330c9e
parentMerge pull request #1959 from MerryMage/revsh-upstream (diff)
downloadyuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.tar
yuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.tar.gz
yuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.tar.bz2
yuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.tar.lz
yuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.tar.xz
yuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.tar.zst
yuzu-9a9e9dc375163090394e212a11e6f58379dc9a90.zip
-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,