From 102566a931eb2c005e28a1bc2ba798117121d34e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 16 Feb 2017 02:08:26 +0900
Subject: [PATCH] =?utf8?q?=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4?=
 =?utf8?q?=E3=83=AB=E3=81=AE=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E3=82=92?=
 =?utf8?q?=20MyApplication.InitCulture=20=E3=82=88=E3=82=8A=E6=89=8B?=
 =?utf8?q?=E5=89=8D=E3=81=AB=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween/ApplicationEvents.cs | 6 ++++--
 OpenTween/Tween.cs             | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenTween/ApplicationEvents.cs b/OpenTween/ApplicationEvents.cs
index 67ffc51c..e1637960 100644
--- a/OpenTween/ApplicationEvents.cs
+++ b/OpenTween/ApplicationEvents.cs
@@ -37,6 +37,7 @@ using System.Threading.Tasks;
 using System.Globalization;
 using System.Reflection;
 using Microsoft.Win32;
+using OpenTween.Setting;
 
 namespace OpenTween
 {
@@ -65,6 +66,8 @@ namespace OpenTween
             if (!SetConfigDirectoryPath())
                 return 1;
 
+            SettingManager.LoadAll();
+
             InitCulture();
 
             // 同じ設定ファイルを使用する OpenTween プロセスの二重起動を防止する
@@ -185,8 +188,7 @@ namespace OpenTween
             {
                 if (MyCommon.cultureStr == null)
                 {
-                    var cfgCommon = SettingCommon.Load();
-                    MyCommon.cultureStr = cfgCommon.Language;
+                    MyCommon.cultureStr = SettingManager.Common.Language;
                     if (MyCommon.cultureStr == "OS")
                     {
                         if (!IsEqualCurrentCulture("ja") &&
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index f508b6a5..bfec0f32 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1198,8 +1198,6 @@ namespace OpenTween
 
         private void LoadConfig()
         {
-            SettingManager.LoadAll();
-
             this._cfgCommon = SettingManager.Common;
             this._cfgLocal = SettingManager.Local;
 
-- 
2.11.0