From c05078dd9ab9dde411a428a25d2761bb4c0e70c4 Mon Sep 17 00:00:00 2001
From: Terry MacDonald <terry.macdonald@cosive.com>
Date: Wed, 2 Dec 2020 21:53:11 +1300
Subject: [PATCH] Fixed inadvertent SteamLibrary duplication

Accidentally was adding uplay games to the
steam library. Used AddRange to combine
the game libraries together so it works.
---
 DisplayMagician/GameLibraries/SteamLibrary.cs |  2 +-
 DisplayMagician/GameLibraries/UplayLibrary.cs |  2 +-
 DisplayMagician/UIForms/ShortcutForm.cs       | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/DisplayMagician/GameLibraries/SteamLibrary.cs b/DisplayMagician/GameLibraries/SteamLibrary.cs
index a3b0ba4..04b0a24 100644
--- a/DisplayMagician/GameLibraries/SteamLibrary.cs
+++ b/DisplayMagician/GameLibraries/SteamLibrary.cs
@@ -57,7 +57,7 @@ namespace DisplayMagician.GameLibraries
             get
             {
                 // Load the Steam Games from Steam Client if needed
-                if (_allSteamGames == null)
+                if (_allSteamGames.Count == 0)
                     LoadInstalledGames();
                 return _allSteamGames;
             }
diff --git a/DisplayMagician/GameLibraries/UplayLibrary.cs b/DisplayMagician/GameLibraries/UplayLibrary.cs
index 7e27078..b83d03f 100644
--- a/DisplayMagician/GameLibraries/UplayLibrary.cs
+++ b/DisplayMagician/GameLibraries/UplayLibrary.cs
@@ -56,7 +56,7 @@ namespace DisplayMagician.GameLibraries
             get
             {
                 // Load the Uplay Games from Uplay Client if needed
-                if (_allUplayGames == null)
+                if (_allUplayGames.Count == 0)
                     LoadInstalledGames();
                 return _allUplayGames;
             }
diff --git a/DisplayMagician/UIForms/ShortcutForm.cs b/DisplayMagician/UIForms/ShortcutForm.cs
index 29d2d41..8f684a3 100644
--- a/DisplayMagician/UIForms/ShortcutForm.cs
+++ b/DisplayMagician/UIForms/ShortcutForm.cs
@@ -27,7 +27,7 @@ namespace DisplayMagician.UIForms
         private ShortcutPermanence _permanence = ShortcutPermanence.Temporary;
         List<StartProgram> _startPrograms = new List<StartProgram>();
         private ShortcutItem _shortcutToEdit = null;
-        List<Game> allGames;
+        List<Game> allGames = new List<Game>();
         private bool _isUnsaved = true;
         private bool _loadedShortcut = false;
         private bool _autoName = true;
@@ -450,7 +450,7 @@ namespace DisplayMagician.UIForms
                 {
                     // Find the UplayGame
                     _gameToUse = new GameStruct();
-                    _gameToUse.GameToPlay = (from uplayGame in SteamLibrary.AllInstalledGames where uplayGame.Id == _gameId select uplayGame).First();
+                    _gameToUse.GameToPlay = (from uplayGame in UplayLibrary.AllInstalledGames where uplayGame.Id == _gameId select uplayGame).First();
                     _gameToUse.StartTimeout = Convert.ToUInt32(nud_timeout_game.Value);
                     _gameToUse.GameArguments = txt_args_game.Text;
                     _gameToUse.GameArgumentsRequired = cb_args_game.Checked;
@@ -706,7 +706,8 @@ namespace DisplayMagician.UIForms
 
             // Populate a full list of games
             // Start with the Steam Games
-            allGames = SteamLibrary.AllInstalledGames;
+            allGames = new List<Game>();
+            allGames.AddRange(SteamLibrary.AllInstalledGames);
             // Then add the Uplay Games
             allGames.AddRange(UplayLibrary.AllInstalledGames);
 
@@ -766,9 +767,9 @@ namespace DisplayMagician.UIForms
                             @"Display Profile name changed",
                             MessageBoxButtons.OK,
                             MessageBoxIcon.Exclamation);
-                            break;
+                            
                         }
-                        
+                        break;
                     }
 
                 }
@@ -935,7 +936,7 @@ namespace DisplayMagician.UIForms
             // Refresh the Shortcut UI
             RefreshShortcutUI();
             ChangeSelectedProfile(chosenProfile);
-            RefreshImageListView(chosenProfile);
+            //RefreshImageListView(chosenProfile);
 
             _loadedShortcut = true;
             _isUnsaved = false;