Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inadvertent SteamLibrary duplication

Browse Source 
Accidentally was adding uplay games to the
steam library. Used AddRange to combine
the game libraries together so it works.
This commit is contained in:
Terry MacDonald 2020-12-02 21:53:11 +13:00
parent c1980b9296
commit c05078dd9a
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DisplayMagician/GameLibraries/SteamLibrary.cs
View File

@ -57,7 +57,7 @@ namespace DisplayMagician.GameLibraries
get get
{ {
// Load the Steam Games from Steam Client if needed // Load the Steam Games from Steam Client if needed
if (_allSteamGames == null) if (_allSteamGames.Count == 0)
LoadInstalledGames(); LoadInstalledGames();
return _allSteamGames; return _allSteamGames;
} }

2
DisplayMagician/GameLibraries/UplayLibrary.cs
View File

@ -56,7 +56,7 @@ namespace DisplayMagician.GameLibraries
get get
{ {
// Load the Uplay Games from Uplay Client if needed // Load the Uplay Games from Uplay Client if needed
if (_allUplayGames == null) if (_allUplayGames.Count == 0)
LoadInstalledGames(); LoadInstalledGames();
return _allUplayGames; return _allUplayGames;
} }

13
DisplayMagician/UIForms/ShortcutForm.cs
View File

@ -27,7 +27,7 @@ namespace DisplayMagician.UIForms
private ShortcutPermanence _permanence = ShortcutPermanence.Temporary; private ShortcutPermanence _permanence = ShortcutPermanence.Temporary;
List<StartProgram> _startPrograms = new List<StartProgram>(); List<StartProgram> _startPrograms = new List<StartProgram>();
private ShortcutItem _shortcutToEdit = null; private ShortcutItem _shortcutToEdit = null;
List<Game> allGames; List<Game> allGames = new List<Game>();
private bool _isUnsaved = true; private bool _isUnsaved = true;
private bool _loadedShortcut = false; private bool _loadedShortcut = false;
private bool _autoName = true; private bool _autoName = true;
@ -450,7 +450,7 @@ namespace DisplayMagician.UIForms
{ {
// Find the UplayGame // Find the UplayGame
_gameToUse = new GameStruct(); _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.StartTimeout = Convert.ToUInt32(nud_timeout_game.Value);
_gameToUse.GameArguments = txt_args_game.Text; _gameToUse.GameArguments = txt_args_game.Text;
_gameToUse.GameArgumentsRequired = cb_args_game.Checked; _gameToUse.GameArgumentsRequired = cb_args_game.Checked;
@ -706,7 +706,8 @@ namespace DisplayMagician.UIForms
// Populate a full list of games // Populate a full list of games
// Start with the Steam Games // Start with the Steam Games
allGames = SteamLibrary.AllInstalledGames; allGames = new List<Game>();
allGames.AddRange(SteamLibrary.AllInstalledGames);
// Then add the Uplay Games // Then add the Uplay Games
allGames.AddRange(UplayLibrary.AllInstalledGames); allGames.AddRange(UplayLibrary.AllInstalledGames);
@ -766,9 +767,9 @@ namespace DisplayMagician.UIForms
@"Display Profile name changed", @"Display Profile name changed",
MessageBoxButtons.OK, MessageBoxButtons.OK,
MessageBoxIcon.Exclamation); MessageBoxIcon.Exclamation);
break;
}
}
break;
} }
} }
@ -935,7 +936,7 @@ namespace DisplayMagician.UIForms
// Refresh the Shortcut UI // Refresh the Shortcut UI
RefreshShortcutUI(); RefreshShortcutUI();
ChangeSelectedProfile(chosenProfile); ChangeSelectedProfile(chosenProfile);
RefreshImageListView(chosenProfile); //RefreshImageListView(chosenProfile);
_loadedShortcut = true; _loadedShortcut = true;
_isUnsaved = false; _isUnsaved = false;