From 7acbd2aee1464db0ff3c74d896e4ee58fcba8a69 Mon Sep 17 00:00:00 2001
From: kiri_feather <kiri_feather@users.sourceforge.jp>
Date: Wed, 15 Jun 2011 11:27:37 +0900
Subject: [PATCH] =?utf8?q?@=E8=A3=9C=E5=AE=8C=E5=B1=A5=E6=AD=B4=E3=81=8B?=
 =?utf8?q?=E3=82=89=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E5=89=8A=E9=99=A4?=
 =?utf8?q?=E3=81=97=E3=81=A6=E3=82=82=E6=B0=B8=E7=B6=9A=E5=8C=96=E3=81=95?=
 =?utf8?q?=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Tween/Tween.vb | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index c7344a52..979c0b34 100644
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -3905,7 +3905,9 @@ Public Class TweenMain
         If e.KeyChar = "@" Then
             If Not SettingDialog.UseAtIdSupplement Then Exit Sub
             '@マーク
+            Dim cnt As Integer = AtIdSupl.ItemCount
             ShowSuplDialog(StatusText, AtIdSupl)
+            If cnt <> AtIdSupl.ItemCount Then _modifySettingAtId = True
             e.Handled = True
         ElseIf e.KeyChar = "#" Then
             If Not SettingDialog.UseHashSupplement Then Exit Sub
@@ -5429,7 +5431,9 @@ RETRY:
                                     If c = "@" Then
                                         pressed = True
                                         startstr = StatusText.Text.Substring(i + 1, endidx - i)
+                                        Dim cnt As Integer = AtIdSupl.ItemCount
                                         ShowSuplDialog(StatusText, AtIdSupl, startstr.Length + 1, startstr)
+                                        If AtIdSupl.ItemCount <> cnt Then _modifySettingAtId = True
                                     ElseIf c = "#" Then
                                         pressed = True
                                         startstr = StatusText.Text.Substring(i + 1, endidx - i)
@@ -6033,19 +6037,23 @@ RETRY:
         If Not ifModified Then
             SaveConfigsCommon()
             SaveConfigsLocal()
-            'SaveConfigsTab(True)    'True:事前に設定ファイル削除
             SaveConfigsTabs()
+            SaveConfigsAtId()
         Else
             If _modifySettingCommon Then SaveConfigsCommon()
             If _modifySettingLocal Then SaveConfigsLocal()
-            If _modifySettingAtId AndAlso SettingDialog.UseAtIdSupplement AndAlso AtIdSupl IsNot Nothing Then
-                _modifySettingAtId = False
-                Dim cfgAtId As New SettingAtIdList(AtIdSupl.GetItemList)
-                cfgAtId.Save()
-            End If
+            If _modifySettingAtId Then SaveConfigsAtId()
         End If
     End Sub
 
+    Private Sub SaveConfigsAtId()
+        If _ignoreConfigSave OrElse Not SettingDialog.UseAtIdSupplement AndAlso AtIdSupl Is Nothing Then Exit Sub
+
+        _modifySettingAtId = False
+        Dim cfgAtId As New SettingAtIdList(AtIdSupl.GetItemList)
+        cfgAtId.Save()
+    End Sub
+
     Private Sub SaveConfigsCommon()
         If _ignoreConfigSave Then Exit Sub
 
-- 
2.11.0