From 9b9d3f9125eefa4bf3173a5acddc241f84f4b332 Mon Sep 17 00:00:00 2001
From: MikeMaximus <mseiferling@gmail.com>
Date: Fri, 15 Jun 2018 16:02:31 -0600
Subject: [PATCH] Changes for issue #131

---
 GBM/Forms/frmGameManager.vb    |  6 +++---
 GBM/Managers/mgrGameTags.vb    | 10 +++++-----
 GBM/My Project/AssemblyInfo.vb |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb
index 2ea80eb..0b9a390 100644
--- a/GBM/Forms/frmGameManager.vb
+++ b/GBM/Forms/frmGameManager.vb
@@ -847,14 +847,14 @@ Public Class frmGameManager
     End Sub
 
     Private Sub FillTagsbyID(ByVal sID As String)
-        Dim hshTags As Hashtable
+        Dim slTags As SortedList
         Dim oTag As clsTag
         Dim sTags As String = String.Empty
         Dim cTrim() As Char = {",", " "}
 
-        hshTags = mgrGameTags.GetTagsByGame(sID)
+        slTags = mgrGameTags.GetTagsByGame(sID)
 
-        For Each de As DictionaryEntry In hshTags
+        For Each de As DictionaryEntry In slTags
             oTag = DirectCast(de.Value, clsTag)
             sTags &= "#" & oTag.Name & ", "
         Next
diff --git a/GBM/Managers/mgrGameTags.vb b/GBM/Managers/mgrGameTags.vb
index 9a22581..78e5e1c 100644
--- a/GBM/Managers/mgrGameTags.vb
+++ b/GBM/Managers/mgrGameTags.vb
@@ -76,11 +76,11 @@
 
     End Sub
 
-    Public Shared Function GetTagsByGame(ByVal sMonitorID As String) As Hashtable
+    Public Shared Function GetTagsByGame(ByVal sMonitorID As String) As SortedList
         Dim oDatabase As New mgrSQLite(mgrSQLite.Database.Local)
         Dim oData As DataSet
         Dim sSQL As String
-        Dim hshList As New Hashtable
+        Dim slList As New SortedList
         Dim hshParams As New Hashtable
         Dim oTag As clsTag
 
@@ -94,10 +94,10 @@
             oTag = New clsTag
             oTag.ID = CStr(dr("TagID"))
             oTag.Name = CStr(dr("Name"))
-            hshList.Add(oTag.Name, oTag)
+            slList.Add(oTag.Name, oTag)
         Next
 
-        Return hshList
+        Return slList
     End Function
 
     Public Shared Function GetTagsByGameForExport(ByVal sMonitorID As String) As List(Of Tag)
@@ -108,7 +108,7 @@
         Dim hshParams As New Hashtable
         Dim oTag As Tag
 
-        sSQL = "SELECT TagID, tags.Name FROM gametags NATURAL JOIN tags WHERE MonitorID = @ID"
+        sSQL = "SELECT TagID, tags.Name FROM gametags NATURAL JOIN tags WHERE MonitorID = @ID ORDER BY tags.Name ASC"
 
         hshParams.Add("ID", sMonitorID)
 
diff --git a/GBM/My Project/AssemblyInfo.vb b/GBM/My Project/AssemblyInfo.vb
index 2d02064..ddd04d2 100644
--- a/GBM/My Project/AssemblyInfo.vb	
+++ b/GBM/My Project/AssemblyInfo.vb	
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.1.2.*")>
-<Assembly: AssemblyFileVersion("1.1.2.0")>
+<Assembly: AssemblyVersion("1.1.3.*")>
+<Assembly: AssemblyFileVersion("1.1.3.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 
\ No newline at end of file