diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-05 04:51:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-05 04:51:08 +0200 |
commit | 403cf6be696b44219e3612b773f5adcdf63c997e (patch) | |
tree | 587ac77fbf0c4aa24c80710c802385bc4ac9b4d6 /src/core/hle/service/am | |
parent | Merge pull request #6278 from lioncash/misc-shadow (diff) | |
parent | service: Resolve cases of member field shadowing (diff) | |
download | yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.gz yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.bz2 yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.lz yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.xz yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.tar.zst yuzu-403cf6be696b44219e3612b773f5adcdf63c997e.zip |
Diffstat (limited to 'src/core/hle/service/am')
-rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/software_keyboard.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp index 73a06def1..b05a5da04 100644 --- a/src/core/hle/service/am/applets/software_keyboard.cpp +++ b/src/core/hle/service/am/applets/software_keyboard.cpp @@ -241,7 +241,7 @@ void SoftwareKeyboard::InitializeForeground() { InitializeFrontendKeyboard(); } -void SoftwareKeyboard::InitializeBackground(LibraryAppletMode applet_mode) { +void SoftwareKeyboard::InitializeBackground(LibraryAppletMode library_applet_mode) { LOG_INFO(Service_AM, "Initializing Inline Software Keyboard Applet."); is_background = true; @@ -256,9 +256,9 @@ void SoftwareKeyboard::InitializeBackground(LibraryAppletMode applet_mode) { swkbd_inline_initialize_arg.size()); if (swkbd_initialize_arg.library_applet_mode_flag) { - ASSERT(applet_mode == LibraryAppletMode::Background); + ASSERT(library_applet_mode == LibraryAppletMode::Background); } else { - ASSERT(applet_mode == LibraryAppletMode::BackgroundIndirectDisplay); + ASSERT(library_applet_mode == LibraryAppletMode::BackgroundIndirectDisplay); } } diff --git a/src/core/hle/service/am/applets/software_keyboard.h b/src/core/hle/service/am/applets/software_keyboard.h index 7c67b7574..7bdef78a7 100644 --- a/src/core/hle/service/am/applets/software_keyboard.h +++ b/src/core/hle/service/am/applets/software_keyboard.h @@ -57,7 +57,7 @@ private: void InitializeForeground(); /// Initializes the inline software keyboard. - void InitializeBackground(LibraryAppletMode applet_mode); + void InitializeBackground(LibraryAppletMode library_applet_mode); /// Processes the text check sent by the application. void ProcessTextCheck(); |