From ab12fbe9634623b20ae82ee1a2cbb35b9db68fd3 Mon Sep 17 00:00:00 2001
From: Nicolas Abram <abramlujan@gmail.com>
Date: Thu, 2 May 2024 08:33:28 -0300
Subject: [PATCH] Fix system dateTime loading in avalonia
 LoadCurrentConfiguration (#6676)

* Fix system dateTime loading in avalonia LoadCurrentConfiguration

* Rename local var to not use upper camel case
---
 src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 0664f436f..0f43d0f7f 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -412,10 +412,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             Language = (int)config.System.Language.Value;
             TimeZone = config.System.TimeZone;
 
-            DateTime currentDateTime = DateTime.Now;
-
+            DateTime currentHostDateTime = DateTime.Now;
+            TimeSpan systemDateTimeOffset = TimeSpan.FromSeconds(config.System.SystemTimeOffset);
+            DateTime currentDateTime = currentHostDateTime.Add(systemDateTimeOffset);
             CurrentDate = currentDateTime.Date;
-            CurrentTime = currentDateTime.TimeOfDay.Add(TimeSpan.FromSeconds(config.System.SystemTimeOffset));
+            CurrentTime = currentDateTime.TimeOfDay;
 
             EnableVsync = config.Graphics.EnableVsync;
             EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;