Skip to content

Commit 3678f14

Browse files
authored
一部の言語環境で日光を正しく読み込まれない問題に対応 (#193)
* ImageSharpの更新 * 保存した計画 (.x4ファイル) を読み込む際、一部の言語環境では日光の値を正しく読み取れず、デフォルト値 (100%) で読み取ってしまう問題を対応した
1 parent f103d45 commit 3678f14

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

X4_ComplexCalculator/Main/WorkArea/SaveDataReader/SaveDataReader2.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Globalization;
23
using System.Linq;
34
using X4_ComplexCalculator.DB;
45
using X4_ComplexCalculator.Main.WorkArea.WorkAreaData.StationSettings;
@@ -83,7 +84,7 @@ protected virtual void RestoreSettings(DBConnection conn, IStationSettings setti
8384
// 日光
8485
const string SQL_2 = "SELECT Value FROM StationSettings WHERE Key = 'Sunlight' UNION ALL SELECT '100' LIMIT 1";
8586
var sunLightString = conn.QuerySingle<string>(SQL_2);
86-
if (double.TryParse(sunLightString, out var sunLight))
87+
if (double.TryParse(sunLightString, CultureInfo.InvariantCulture, out var sunLight))
8788
{
8889
settings.Sunlight = sunLight;
8990
}

X4_DataExporterWPF/X4_DataExporterWPF.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Pfim" Version="0.11.3" />
1818
<PackageReference Include="Prism.Core" Version="9.0.537" />
1919
<PackageReference Include="ReactiveProperty" Version="9.6.0" />
20-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
20+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
2121
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
2222
<PackageReference Include="WPFLocalizeExtension" Version="3.10.0" />
2323
</ItemGroup>

0 commit comments

Comments
 (0)