Changeset 1261

Timestamp:

1/20/2010 3:33:20 PM (8 weeks ago)

Author:

vessper

Message:

20/01/2010 (1.14.0.1261)

---

- Prism: Fix for search and filter functions in Corp Hangar mode

Files:

• trunk/EveHQ.Prism/Forms/frmPrism.vb (modified) (3 diffs)

trunk/EveHQ.Prism/Forms/frmPrism.vb

@@ -1572 +1572 @@
                 If (filters.Count > 0 And catFilters.Contains(cLoc.SubItems(AssetColumn.Category).Text) = False And groupFilters.Contains(cLoc.SubItems(AssetColumn.Group).Text) = False) Or (searchText <> "" And cLoc.Text.ToLower.Contains(searchText.ToLower) = False) Then
                     pLoc.Items.Remove(cLoc)
-                    assetList.Remove(cLoc.Tag)
-                    totalAssetCount -= CLng(cLoc.SubItems(AssetColumn.Quantity).Text)
+                    If cLoc.Tag IsNot Nothing Then
+                        assetList.Remove(cLoc.Tag)
+                    End If
+                    If IsNumeric(cLoc.SubItems(AssetColumn.Quantity).Text) = True Then
+                        totalAssetCount -= CLng(cLoc.SubItems(AssetColumn.Quantity).Text)
+                    End If
                     cL -= 1
                 End If
@@ -1581 +1585 @@
                     If (filters.Count > 0 And catFilters.Contains(cLoc.SubItems(AssetColumn.Category).Text) = False And groupFilters.Contains(cLoc.SubItems(AssetColumn.Group).Text) = False) Or (searchText <> "" And cLoc.Text.ToLower.Contains(searchText.ToLower) = False) Then
                         pLoc.Items.Remove(cLoc)
-                        assetList.Remove(cLoc.Tag)
-                        totalAssetCount -= CLng(cLoc.SubItems(AssetColumn.Quantity).Text)
+                        If cLoc.Tag IsNot Nothing Then
+                            assetList.Remove(cLoc.Tag)
+                        End If
+                        If IsNumeric(cLoc.SubItems(AssetColumn.Quantity).Text) = True Then
+                            totalAssetCount -= CLng(cLoc.SubItems(AssetColumn.Quantity).Text)
+                        End If
                         cL -= 1
                     End If
@@ -1593 +1601 @@
                         cLoc.SubItems(AssetColumn.Quantity).Text = ""
                         cLoc.SubItems(AssetColumn.Price).Text = ""
-                        assetList.Remove(cLoc.Tag)
+                        If cLoc.Tag IsNot Nothing Then
+                            assetList.Remove(cLoc.Tag)
+                        End If
                     End If
                 End If