Changeset 31713

Timestamp:

03/31/09 14:53:11 (4 years ago)

Author:

syo68k

Message:

FavタブでFav解除するとクラッシュするバグ修正 Bug:詳細領域の発言がFav状態のまま

Location:

lang/vb2005/Tween/Tween

Files:

• StatusDictionary.vb (modified) (1 diff)
• Tween.vb (modified) (4 diffs)

lang/vb2005/Tween/Tween/StatusDictionary.vb

@@ -426 +426 @@
     End Sub
 
+    Public Sub RemovePost(ByVal Name As String, ByVal Id As Long)
+        SyncLock LockObj
+            Dim post As PostClass = _statuses(Id)
+            '指定タブから該当ID削除
+            Dim tab As TabClass = _tabs(Name)
+            If tab.Contains(Id) Then
+                If tab.UnreadManage AndAlso Not post.IsRead Then    '未読管理
+                    tab.UnreadCount -= 1
+                    Me.SetNextUnreadId(Id, tab)
+                End If
+                tab.Remove(Id)
+            End If
+        End SyncLock
+    End Sub
+
     Public Sub RemovePost(ByVal Id As Long)
         SyncLock LockObj

lang/vb2005/Tween/Tween/Tween.vb

@@ -1407 +1407 @@
                     args.page = i + 1
                     bw.ReportProgress(50, MakeStatusMessage(args, False))
-                    bw.ReportProgress(60, MakeStatusMessage(args, False))
                     If post.IsFav Then
                         ret = Twitter.PostFavRemove(post.Id)
@@ -1413 +1412 @@
                             args.sIds.Add(post.Id)
                             post.IsFav = False    'リスト再描画必要
-                            _statuses.Tabs.Item("Favourites").Remove(post.Id)
-                            If _curTab.Text.Equals("Favourites") Then
-                                _itemCache = Nothing    'キャッシュ破棄
-                                _postCache = Nothing
-                                _curPost = Nothing
-                                _curItemIndex = -1
-                            End If
                         End If
                     End If
@@ -1653 +1645 @@
         End If
 
+        If rslt.type = WORKERTYPE.FavRemove Then
+            Dim nm As Integer = 0
+            For Each i As Long In rslt.sIds
+                _statuses.RemovePost("Favourites", i)
+                nm += 1
+            Next
+            If _curTab.Text.Equals("Favourites") Then
+                _curList.VirtualListSize -= nm
+                _itemCache = Nothing    'キャッシュ破棄
+                _postCache = Nothing
+                _curPost = Nothing
+                _curItemIndex = -1
+            End If
+        End If
+
         'リストに反映
         Dim busy As Boolean = False
@@ -1721 +1728 @@
             Case WORKERTYPE.FavAdd, WORKERTYPE.BlackFavAdd, WORKERTYPE.FavRemove
                 _curList.BeginUpdate()
-                For i As Integer = 0 To rslt.sIds.Count - 1
-                    If _curTab.Text.Equals(rslt.tName) Then
-                        Dim idx As Integer = _statuses.Tabs(rslt.tName).GetIndex(rslt.sIds(i))
-                        Dim post As PostClass = _statuses.Item(rslt.sIds(i))
-                        ChangeCacheStyleRead(post.IsRead, idx, _curTab)
-                        If idx = _curItemIndex Then DispSelectedPost() '選択アイテム再表示
-                    End If
-                Next
+                If rslt.type = WORKERTYPE.FavRemove AndAlso _curTab.Text.Equals("Favourites") Then
+                    For i As Integer = 0 To _curList.VirtualListSize - 1
+                        '
+                    Next
+                Else
+                    For i As Integer = 0 To rslt.sIds.Count - 1
+                        If _curTab.Text.Equals(rslt.tName) Then
+                            Dim idx As Integer = _statuses.Tabs(rslt.tName).GetIndex(rslt.sIds(i))
+                            Dim post As PostClass = _statuses.Item(rslt.sIds(i))
+                            ChangeCacheStyleRead(post.IsRead, idx, _curTab)
+                            If idx = _curItemIndex Then DispSelectedPost() '選択アイテム再表示
+                        End If
+                    Next
+                End If
                 _curList.EndUpdate()
             Case WORKERTYPE.PostMessage