diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-03-08 15:16:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-08 15:16:27 +0100 |
commit | f3f57f90fed6d1c3b478c9fceb91a54579b4947d (patch) | |
tree | 3280b90f3b54b6f8f3fca804cab04699897faa3f /src/core/hle/service/ns | |
parent | Merge pull request #9904 from liamwhite/ws (diff) | |
parent | hle: rename legacy errors to Results (diff) | |
download | yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.gz yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.bz2 yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.lz yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.xz yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.tar.zst yuzu-f3f57f90fed6d1c3b478c9fceb91a54579b4947d.zip |
Diffstat (limited to 'src/core/hle/service/ns')
-rw-r--r-- | src/core/hle/service/ns/errors.h | 5 | ||||
-rw-r--r-- | src/core/hle/service/ns/ns.cpp | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/core/hle/service/ns/errors.h b/src/core/hle/service/ns/errors.h index 8a7621798..16d2ea6f7 100644 --- a/src/core/hle/service/ns/errors.h +++ b/src/core/hle/service/ns/errors.h @@ -7,5 +7,6 @@ namespace Service::NS { -constexpr Result ERR_APPLICATION_LANGUAGE_NOT_FOUND{ErrorModule::NS, 300}; -}
\ No newline at end of file +constexpr Result ResultApplicationLanguageNotFound{ErrorModule::NS, 300}; + +} diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index d6f0faea2..376067a95 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -416,14 +416,14 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage( if (application_language == std::nullopt) { LOG_ERROR(Service_NS, "Could not convert application language! language_code={}", language_code); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } const auto priority_list = GetApplicationLanguagePriorityList(*application_language); if (!priority_list) { LOG_ERROR(Service_NS, "Could not find application language priorities! application_language={}", *application_language); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } // Try to find a valid language. @@ -436,7 +436,7 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage( LOG_ERROR(Service_NS, "Could not find a valid language! supported_languages={:08X}", supported_languages); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } void IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode( @@ -461,7 +461,7 @@ ResultVal<u64> IApplicationManagerInterface::ConvertApplicationLanguageToLanguag ConvertToLanguageCode(static_cast<ApplicationLanguage>(application_language)); if (language_code == std::nullopt) { LOG_ERROR(Service_NS, "Language not found! application_language={}", application_language); - return ERR_APPLICATION_LANGUAGE_NOT_FOUND; + return Service::NS::ResultApplicationLanguageNotFound; } return static_cast<u64>(*language_code); |