AppendSettingDialog.Instanceを削除

diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs
index 53298e7..6427442 100644 (file)
--- a/OpenTween/AppendSettingDialog.cs
+++ b/OpenTween/AppendSettingDialog.cs
@@ -45,7 +45,6 @@ namespace OpenTween
 {
     public partial class AppendSettingDialog : OTBaseForm
     {
-        private static AppendSettingDialog _instance = new AppendSettingDialog();
         internal Twitter tw;
 
         private bool _ValidationError = false;
@@ -414,11 +413,6 @@ namespace OpenTween
             this.GetPeriodPanel.LabelUserStreamActive.Visible = tw.UserStreamEnabled;
         }
 
-        public static AppendSettingDialog Instance
-        {
-            get { return _instance; }
-        }
-
         private bool BitlyValidation(string id, string apikey)
         {
             if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(apikey))

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index e0cc42d..5db5002 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -103,7 +103,7 @@ namespace OpenTween
         private GrowlHelper gh = new GrowlHelper(Application.ProductName);
 
         //サブ画面インスタンス
-        private AppendSettingDialog SettingDialog = AppendSettingDialog.Instance;       //設定画面インスタンス
+        private AppendSettingDialog SettingDialog = new AppendSettingDialog();       //設定画面インスタンス
         private SearchWordDialog SearchDialog = new SearchWordDialog();     //検索画面インスタンス
         private FilterDialog fltDialog = new FilterDialog(); //フィルター編集画面
         private OpenURL UrlDialog = new OpenURL();
@@ -850,8 +850,6 @@ namespace OpenTween
                 _clInputBackcolor = this._cfgLocal.ColorInputBackcolor;
                 _clInputFont = this._cfgLocal.ColorInputFont;
                 _fntInputFont = this._cfgLocal.FontInputFont;
-
-                //他の設定項目は、随時設定画面で保持している値を読み出して使用
             }
 
             _brsBackColorMine = new SolidBrush(_clSelf);