[DB] Force InvariantCulture when converting to double

CollapseLauncher · Oct 13, 2024 · ae8f379 · ae8f379
1 parent d3df330
commit ae8f379
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs b/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs
@@ -320,7 +320,7 @@ public void AddMinute()
                     playtimeInner._gameVersion  = _gameVersion;
                     DbConfig.SetAndSaveValue(KeyLastUpdated, _unixStampDb.ToString());
                     LastDbUpdate = DateTime.Now;
-                    Save();
+                    playtimeInner.Save();
                     return (true, playtimeInner);
                 }
 
@@ -351,11 +351,11 @@ private async Task UpdatePlaytime_Database_Push(string jsonData, double totalTim
                 var unixStamp = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
                 await DbHandler.StoreKeyValue(KeyPlaytimeJson, jsonData);
                 await DbHandler.StoreKeyValue(KeyTotalTime,    totalTime.ToString(CultureInfo.InvariantCulture));
-                await DbHandler.StoreKeyValue(KeyLastPlayed,   lastPlayed != null ? lastPlayed.ToString() : "null");
+                await DbHandler.StoreKeyValue(KeyLastPlayed,   lastPlayed != null ? lastPlayed.Value.ToString(CultureInfo.InvariantCulture) : "null");
                 await DbHandler.StoreKeyValue(KeyLastUpdated,  unixStamp.ToString());
                 DbConfig.SetAndSaveValue(KeyLastUpdated, unixStamp);
-                _unixStampDb     = Convert.ToInt32(unixStamp);
-                LastDbUpdate     = curDateTime;
+                _unixStampDb = Convert.ToInt32(unixStamp);
+                LastDbUpdate = curDateTime;
             }
             catch (Exception e)
             {
@@ -378,10 +378,10 @@ private async Task UpdatePlaytime_Database_Pull()
                 _jsonDataDb   = await DbHandler.QueryKey(KeyPlaytimeJson);
 
                 var totalTimeDbStr = await DbHandler.QueryKey(KeyTotalTime);
-                _totalTimeDb  = string.IsNullOrEmpty(totalTimeDbStr) ? null : Convert.ToDouble(totalTimeDbStr);
+                _totalTimeDb  = string.IsNullOrEmpty(totalTimeDbStr) ? null : Convert.ToDouble(totalTimeDbStr, CultureInfo.InvariantCulture);
 
                 var lpDb = await DbHandler.QueryKey(KeyLastPlayed);
-                _lastPlayedDb    = !string.IsNullOrEmpty(lpDb) && !lpDb.Contains("null") ? Convert.ToDouble(lpDb) : null; // if Db data is null, return null
+                _lastPlayedDb    = !string.IsNullOrEmpty(lpDb) && !lpDb.Contains("null") ? Convert.ToDouble(lpDb, CultureInfo.InvariantCulture) : null; // if Db data is null, return null
 
                 _isDbPullSuccess = true;
             }

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml
@@ -1,4 +1,4 @@
-<!--  ReSharper disable IdentifierTypo  -->
+<!--  ReSharper disable IdentifierTypo  -->
 <!--  ReSharper disable UnusedMember.Local  -->
 <!--  ReSharper disable Xaml.ConstructorWarning  -->
 <Page x:Class="CollapseLauncher.Pages.HomePage"
@@ -2428,7 +2428,7 @@
                                     </Grid>
                                 </Button>
                                 <Button x:Name="ResetPlaytimeButton"
-                                        Margin="-4,0,-4,-4"
+                                        Margin="-4,0"
                                         HorizontalAlignment="Stretch"
                                         HorizontalContentAlignment="Left"
                                         Click="ResetPlaytimeButton_Click"