Просмотр исходного кода

Merge pull request #13160 from liamwhite/time

glue: load initial year setting as s32
Narr the Reg 2 лет назад
Родитель
Сommit
9e27dbb53b
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      src/core/hle/service/glue/time/manager.cpp

+ 4 - 3
src/core/hle/service/glue/time/manager.cpp

@@ -51,16 +51,17 @@ s64 CalendarTimeToEpoch(Service::PSC::Time::CalendarTime calendar) {
 }
 
 s64 GetEpochTimeFromInitialYear(std::shared_ptr<Service::Set::ISystemSettingsServer>& set_sys) {
+    s32 year{2000};
+    set_sys->GetSettingsItemValueImpl(year, "time", "standard_user_clock_initial_year");
+
     Service::PSC::Time::CalendarTime calendar{
-        .year = 2000,
+        .year = static_cast<s16>(year),
         .month = 1,
         .day = 1,
         .hour = 0,
         .minute = 0,
         .second = 0,
     };
-    set_sys->GetSettingsItemValueImpl<s16>(calendar.year, "time",
-                                           "standard_user_clock_initial_year");
     return CalendarTimeToEpoch(calendar);
 }