From d16735f5b618942136d6ab53466e3be0a382c30a Mon Sep 17 00:00:00 2001 From: MaranBr Date: Fri, 2 Oct 2026 02:24:58 +0200 Subject: [PATCH] [am] Properly handle None frontend applet (#4500) - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Properly handle the `AppletId::None` case by returning a null frontend applet instead of falling back to the stub implementation. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4500 Reviewed-by: lizzie Reviewed-by: CamilleLaVey --- src/core/hle/service/am/frontend/applets.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/am/frontend/applets.cpp b/src/core/hle/service/am/frontend/applets.cpp index d622c7b7a7..c59e4b9c6b 100644 --- a/src/core/hle/service/am/frontend/applets.cpp +++ b/src/core/hle/service/am/frontend/applets.cpp @@ -250,9 +250,10 @@ std::shared_ptr FrontendAppletHolder::GetApplet(std::shared_ptr< return std::make_shared(system, applet, mode, *frontend.photo_viewer); case AppletId::NetConnect: return std::make_shared(system, applet, mode, *frontend.net_connect); + case AppletId::None: + return nullptr; default: - LOG_ERROR(Service_AM, "No backend implementation exists for applet_id={:02X} program_id={:016X}" - "Falling back to stub applet", static_cast(id), applet->program_id); + UNIMPLEMENTED_MSG("No frontend implementation exists for applet_id={:02X} program_id={:016X}! Using stub applet.", static_cast(id), applet->program_id); return std::make_shared(system, applet, id, mode); } }