From 66e16d1c9a4abd6f9c354168a9ac48e9d24ee006 Mon Sep 17 00:00:00 2001 From: piepie62 Date: Mon, 4 Mar 2019 00:49:48 -0700 Subject: [PATCH] Require entire key combination --- stratosphere/ams_mitm/source/utils.cpp | 2 +- stratosphere/loader/source/ldr_content_management.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stratosphere/ams_mitm/source/utils.cpp b/stratosphere/ams_mitm/source/utils.cpp index 20a4451bc..8f7ca103f 100644 --- a/stratosphere/ams_mitm/source/utils.cpp +++ b/stratosphere/ams_mitm/source/utils.cpp @@ -464,7 +464,7 @@ Result Utils::GetKeysDown(u64 *keys) { static bool HasOverrideKey(OverrideKey *cfg) { u64 kDown = 0; - bool keys_triggered = (R_SUCCEEDED(Utils::GetKeysDown(&kDown)) && ((kDown & cfg->key_combination) != 0)); + bool keys_triggered = (R_SUCCEEDED(Utils::GetKeysDown(&kDown)) && ((~kDown & cfg->key_combination) == 0)); return Utils::IsSdInitialized() && (cfg->override_by_default ^ keys_triggered); } diff --git a/stratosphere/loader/source/ldr_content_management.cpp b/stratosphere/loader/source/ldr_content_management.cpp index c541e3b54..41919d2f6 100644 --- a/stratosphere/loader/source/ldr_content_management.cpp +++ b/stratosphere/loader/source/ldr_content_management.cpp @@ -399,7 +399,7 @@ OverrideKey ContentManagement::GetTitleOverrideKey(u64 tid) { static bool ShouldOverrideContents(OverrideKey *cfg) { u64 kDown = 0; - bool keys_triggered = (R_SUCCEEDED(HidManagement::GetKeysDown(&kDown)) && ((kDown & cfg->key_combination) != 0)); + bool keys_triggered = (R_SUCCEEDED(HidManagement::GetKeysDown(&kDown)) && ((~kDown & cfg->key_combination) == 0)); return g_has_initialized_fs_dev && (cfg->override_by_default ^ keys_triggered); }