1.3

Fixed some sort issues and file not being closed by the picturebox
elierodrigue · Dec 14, 2018 · bb031d6 · bb031d6
1 parent 9b790fa
commit bb031d6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/PSClassicTool/GameInfo.cs b/PSClassicTool/GameInfo.cs
@@ -142,7 +142,16 @@ private void btnReplace_Click(object sender, EventArgs e)
                     Console.Write("");
                     try
                     {
-                        pictureBox1.Image = Bitmap.FromFile(GameManager.getInstance().GetBoxArtPath(_CurrentDisc.GAME_ID, _CurrentDisc.BASENAME));
+                        try
+                        {
+                            byte[] data = System.IO.File.ReadAllBytes(GameManager.getInstance().GetBoxArtPath(_gi.GAME_ID, _CurrentDisc.BASENAME));
+                            pictureBox1.Image = Bitmap.FromStream(new System.IO.MemoryStream(data));
+                        }
+                        catch (Exception exc)
+                        {
+                            pictureBox1.Image = null;
+                        }
+
                     }
                     catch (Exception exc)
                     {
@@ -209,7 +218,8 @@ private void btnReplace_Click(object sender, EventArgs e)
 
                     try
                     {
-                        pictureBox1.Image = Bitmap.FromFile(GameManager.getInstance().GetBoxArtPath(_CurrentDisc.GAME_ID, _CurrentDisc.BASENAME));
+                        byte[] dataf = System.IO.File.ReadAllBytes(GameManager.getInstance().GetBoxArtPath(_gi.GAME_ID, _CurrentDisc.BASENAME));
+                        pictureBox1.Image = Bitmap.FromStream(new System.IO.MemoryStream(dataf));
                     }
                     catch (Exception exc)
                     {

diff --git a/PSClassicTool/Managers/GameManager.cs b/PSClassicTool/Managers/GameManager.cs
@@ -20,6 +20,7 @@ public int CompareTo(DiscInfo inf)
     }
     public class GameInfo :IComparable<GameInfo>
     {
+        public static bool sortByGameId = false;
         public int CompareTo(GameInfo inf)
         {
             return GAME_TITLE_STRING.CompareTo(inf.GAME_TITLE_STRING);
@@ -177,6 +178,9 @@ public GameInfo[] ListGames()
                 ret.Add(gi);
             }
         }
+        GameInfo.sortByGameId = true;
+        ret.Sort();
+        GameInfo.sortByGameId = false;
        /* string sql = "SELECT * FROM GAME";
         SQLiteCommand command = new SQLiteCommand(sql, conn);
         SQLiteDataReader reader = command.ExecuteReader();