summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/time/time_zone_service.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-06-18 08:47:16 +0200
committerGitHub <noreply@github.com>2023-06-18 08:47:16 +0200
commit6e293be20bf958a5a8ee940ff1a0e01d81d44ef4 (patch)
tree1fd668b23ce6987a410cdde56b8a626c8bedec78 /src/core/hle/service/time/time_zone_service.cpp
parentMerge pull request #10828 from liamwhite/somehow-still-using-llvm-14 (diff)
parenttime_zone_service: Always write time zone rule data (diff)
downloadyuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.tar
yuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.tar.gz
yuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.tar.bz2
yuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.tar.lz
yuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.tar.xz
yuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.tar.zst
yuzu-6e293be20bf958a5a8ee940ff1a0e01d81d44ef4.zip
Diffstat (limited to 'src/core/hle/service/time/time_zone_service.cpp')
-rw-r--r--src/core/hle/service/time/time_zone_service.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/core/hle/service/time/time_zone_service.cpp
index e8273e152..8171c82a5 100644
--- a/src/core/hle/service/time/time_zone_service.cpp
+++ b/src/core/hle/service/time/time_zone_service.cpp
@@ -112,20 +112,14 @@ void ITimeZoneService::LoadTimeZoneRule(HLERequestContext& ctx) {
LOG_DEBUG(Service_Time, "called, location_name={}", location_name);
TimeZone::TimeZoneRule time_zone_rule{};
- if (const Result result{
- time_zone_content_manager.LoadTimeZoneRule(time_zone_rule, location_name)};
- result != ResultSuccess) {
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(result);
- return;
- }
+ const Result result{time_zone_content_manager.LoadTimeZoneRule(time_zone_rule, location_name)};
std::vector<u8> time_zone_rule_outbuffer(sizeof(TimeZone::TimeZoneRule));
std::memcpy(time_zone_rule_outbuffer.data(), &time_zone_rule, sizeof(TimeZone::TimeZoneRule));
ctx.WriteBuffer(time_zone_rule_outbuffer);
IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ rb.Push(result);
}
void ITimeZoneService::ToCalendarTime(HLERequestContext& ctx) {