diff options
author | bunnei <bunneidev@gmail.com> | 2021-04-27 01:19:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-27 01:19:49 +0200 |
commit | cd80471c902540ae1086732234d45b6fb5b2e169 (patch) | |
tree | 7a58e71917ee449e441e726b662b78757a3310d8 /src/core/hle/service/am | |
parent | Merge pull request #6236 from Morph1984/swkbd-button-hint-scaling (diff) | |
parent | service: Eliminate cases of member shadowing (diff) | |
download | yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.gz yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.bz2 yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.lz yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.xz yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.tar.zst yuzu-cd80471c902540ae1086732234d45b6fb5b2e169.zip |
Diffstat (limited to 'src/core/hle/service/am')
-rw-r--r-- | src/core/hle/service/am/applets/error.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/general_backend.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/am/applets/error.cpp b/src/core/hle/service/am/applets/error.cpp index 23e30aa45..0dd6ec68e 100644 --- a/src/core/hle/service/am/applets/error.cpp +++ b/src/core/hle/service/am/applets/error.cpp @@ -158,11 +158,11 @@ void Error::Execute() { break; case ErrorAppletMode::ShowSystemError: case ErrorAppletMode::ShowApplicationError: { - const auto system = mode == ErrorAppletMode::ShowSystemError; + const auto is_system = mode == ErrorAppletMode::ShowSystemError; const auto& main_text = - system ? args->system_error.main_text : args->application_error.main_text; + is_system ? args->system_error.main_text : args->application_error.main_text; const auto& detail_text = - system ? args->system_error.detail_text : args->application_error.detail_text; + is_system ? args->system_error.detail_text : args->application_error.detail_text; const auto main_text_string = Common::StringFromFixedZeroTerminatedBuffer(main_text.data(), main_text.size()); diff --git a/src/core/hle/service/am/applets/general_backend.cpp b/src/core/hle/service/am/applets/general_backend.cpp index b26abad36..b7483261e 100644 --- a/src/core/hle/service/am/applets/general_backend.cpp +++ b/src/core/hle/service/am/applets/general_backend.cpp @@ -96,7 +96,7 @@ void Auth::Execute() { switch (type) { case AuthAppletType::ShowParentalAuthentication: { - const auto callback = [this](bool successful) { AuthFinished(successful); }; + const auto callback = [this](bool is_successful) { AuthFinished(is_successful); }; if (arg0 == 1 && arg1 == 0 && arg2 == 1) { // ShowAuthenticatorForConfiguration |