From 1f291bbcd8973d6ba4b20cb2dd66b4ed3501f83e Mon Sep 17 00:00:00 2001
From: "Michael J. Seiferling" <mseiferling@gmail.com>
Date: Wed, 14 Jun 2017 09:06:53 -0600
Subject: [PATCH] Fixed bug found while testing issue #81

---
 GBM/Forms/frmGameTags.vb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/GBM/Forms/frmGameTags.vb b/GBM/Forms/frmGameTags.vb
index 737147c..c74f3a5 100644
--- a/GBM/Forms/frmGameTags.vb
+++ b/GBM/Forms/frmGameTags.vb
@@ -156,13 +156,16 @@ Public Class frmGameTags
 
         If bNewMode Then
             For Each kp As KeyValuePair(Of String, String) In oTagList
+                'We need to be sure the tags still exist if the "Setup Tags" form was used
                 If hshTags.ContainsKey(kp.Value) Then
-                    hshTags.Remove(kp.Value)
+                    lstGameTags.Items.Add(kp)
                 End If
             Next
 
             For Each kp As KeyValuePair(Of String, String) In oTagList
-                lstGameTags.Items.Add(kp)
+                If hshTags.ContainsKey(kp.Value) Then
+                    hshTags.Remove(kp.Value)
+                End If
             Next
         Else
             hshGameTags = mgrGameTags.GetTagsByGameMulti(IDList)
@@ -240,6 +243,7 @@ Public Class frmGameTags
     End Sub
 
     Private Sub btnOpenTags_Click(sender As Object, e As EventArgs) Handles btnOpenTags.Click
+        If bNewMode Then BuildTagList()
         OpenTags()
     End Sub
 End Class
\ No newline at end of file