N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

applet_manager: Fix checking if HLE applet exists. (#7325)

Browse source
This commit is contained in:
Steveice10 2024-01-06 15:21:35 -08:00 committed by GitHub
parent 4f00eb20db
commit bc352e8168
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/hle/service/apt/applet_manager.cpp
View file

@ -228,8 +228,9 @@ void AppletManager::CancelAndSendParameter(const MessageParameter& parameter) {
parameter.sender_id, parameter.destination_id, parameter.signal, parameter.buffer.size()); parameter.sender_id, parameter.destination_id, parameter.signal, parameter.buffer.size());
// If the applet is being HLEd, send directly to the applet. // If the applet is being HLEd, send directly to the applet.
if (hle_applets.contains(parameter.destination_id)) { const auto applet = hle_applets[parameter.destination_id];
hle_applets[parameter.destination_id]->ReceiveParameter(parameter); if (applet != nullptr) {
applet->ReceiveParameter(parameter);
} else { } else {
// Otherwise, send the parameter the LLE way. // Otherwise, send the parameter the LLE way.
next_parameter = parameter; next_parameter = parameter;
@ -575,7 +576,7 @@ Result AppletManager::PrepareToStartLibraryApplet(AppletId applet_id) {
} }
// If we weren't able to load the native applet title, try to fallback to an HLE implementation. // If we weren't able to load the native applet title, try to fallback to an HLE implementation.
if (hle_applets.contains(applet_id)) { if (hle_applets[applet_id] != nullptr) {
LOG_WARNING(Service_APT, "Applet has already been started id={:03X}", applet_id); LOG_WARNING(Service_APT, "Applet has already been started id={:03X}", applet_id);
return ResultSuccess; return ResultSuccess;
} else { } else {
@ -602,7 +603,7 @@ Result AppletManager::PreloadLibraryApplet(AppletId applet_id) {
} }
// If we weren't able to load the native applet title, try to fallback to an HLE implementation. // If we weren't able to load the native applet title, try to fallback to an HLE implementation.
if (hle_applets.contains(applet_id)) { if (hle_applets[applet_id] != nullptr) {
LOG_WARNING(Service_APT, "Applet has already been started id={:08X}", applet_id); LOG_WARNING(Service_APT, "Applet has already been started id={:08X}", applet_id);
return ResultSuccess; return ResultSuccess;
} else { } else {
@ -1494,13 +1495,13 @@ void AppletManager::LoadInputDevices() {
/// Handles updating the current Applet every time it's called. /// Handles updating the current Applet every time it's called.
void AppletManager::HLEAppletUpdateEvent(std::uintptr_t user_data, s64 cycles_late) { void AppletManager::HLEAppletUpdateEvent(std::uintptr_t user_data, s64 cycles_late) {
const auto id = static_cast<AppletId>(user_data); const auto id = static_cast<AppletId>(user_data);
if (!hle_applets.contains(id)) { const auto applet = hle_applets[id];
if (applet == nullptr) {
// Dead applet, exit event loop. // Dead applet, exit event loop.
LOG_WARNING(Service_APT, "Attempted to update dead applet id={:03X}", id); LOG_WARNING(Service_APT, "Attempted to update missing applet id={:03X}", id);
return; return;
} }
const auto applet = hle_applets[id];
if (applet->IsActive()) { if (applet->IsActive()) {
applet->Update(); applet->Update();
} }