mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 01:23:23 +02:00
Merge pull request #10863 from lat9nq/tz-end-of-string
time_zone_manager: Stop on comma
This commit is contained in:
commit
8ad64bc253
@ -911,9 +911,13 @@ static Result ToCalendarTimeInternal(const TimeZoneRule& rules, s64 time,
|
|||||||
|
|
||||||
calendar_additional_info.is_dst = rules.ttis[tti_index].is_dst;
|
calendar_additional_info.is_dst = rules.ttis[tti_index].is_dst;
|
||||||
const char* time_zone{&rules.chars[rules.ttis[tti_index].abbreviation_list_index]};
|
const char* time_zone{&rules.chars[rules.ttis[tti_index].abbreviation_list_index]};
|
||||||
for (int index{}; time_zone[index] != '\0'; ++index) {
|
u32 index;
|
||||||
|
for (index = 0; time_zone[index] != '\0' && time_zone[index] != ',' &&
|
||||||
|
index < calendar_additional_info.timezone_name.size() - 1;
|
||||||
|
++index) {
|
||||||
calendar_additional_info.timezone_name[index] = time_zone[index];
|
calendar_additional_info.timezone_name[index] = time_zone[index];
|
||||||
}
|
}
|
||||||
|
calendar_additional_info.timezone_name[index] = '\0';
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user