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 double added steam library

Browse Source 
Accidentally had the steam library added twice when parsed from two different locations, which doubled up the steam icons. Now fixed.
This commit is contained in:
Terry MacDonald 2021-11-08 21:48:18 +13:00
parent 8cf85c5227
commit a716c4160a
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DisplayMagician/GameLibraries/SteamLibrary.cs
View File

@ -633,14 +633,17 @@ namespace DisplayMagician.GameLibraries
{ {
// Check the entry is actually a directory // Check the entry is actually a directory
string steamLibraryPath = Regex.Unescape(steamLibraryMatch.Groups[1].Value); string steamLibraryPath = Regex.Unescape(steamLibraryMatch.Groups[1].Value);
if (Directory.Exists(steamLibraryPath)) if (!steamLibraryPath.Equals(_steamPath) && Directory.Exists(steamLibraryPath))
{ {
logger.Info($"SteamLibrary/LoadInstalledGames: Found additional steam library {steamLibraryPath}"); if (!steamLibrariesPaths.Contains(steamLibraryPath))
{
logger.Info($"SteamLibrary/LoadInstalledGames: Found additional steam library {steamLibraryPath} in the {_steamLibraryFoldersVdfFile} VDF file ");
steamLibrariesPaths.Add(steamLibraryPath); steamLibrariesPaths.Add(steamLibraryPath);
} }
}
else else
{ {
logger.Trace($"SteamLibrary/LoadInstalledGames: Found what it thought was an additional steam library {steamLibraryPath} in {_steamLibraryFoldersVdfFile}, but it didn't exist on the file system"); logger.Trace($"SteamLibrary/LoadInstalledGames: Found what it thought was an additional steam library {steamLibraryPath} in {_steamLibraryFoldersVdfFile}, but it didn't exist on the file system, or was already added");
} }
} }
} }
@ -669,18 +672,19 @@ namespace DisplayMagician.GameLibraries
if (steamLibraryMatch.Success) if (steamLibraryMatch.Success)
{ {
string steamLibraryPath = Regex.Unescape(steamLibraryMatch.Groups[1].Value); string steamLibraryPath = Regex.Unescape(steamLibraryMatch.Groups[1].Value);
if (Directory.Exists(steamLibraryPath)) if (!steamLibraryPath.Equals(_steamPath) && Directory.Exists(steamLibraryPath))
{ {
logger.Info($"SteamLibrary/LoadInstalledGames: Found additional steam library {steamLibraryPath}"); logger.Info($"SteamLibrary/LoadInstalledGames: Found additional steam library {steamLibraryPath}");
// Check if the steam library is already in the list! // Check if the steam library is already in the list!
if (!steamLibrariesPaths.Contains(steamLibraryPath)) if (!steamLibrariesPaths.Contains(steamLibraryPath))
{ {
logger.Info($"SteamLibrary/LoadInstalledGames: Aadditional steam library {steamLibraryPath}");
steamLibrariesPaths.Add(steamLibraryPath); steamLibrariesPaths.Add(steamLibraryPath);
} }
} }
else else
{ {
logger.Trace($"SteamLibrary/LoadInstalledGames: Found what it thought was an additional steam library {steamLibraryPath} in {_steamConfigVdfFile}, but it didn't exist on the file system"); logger.Trace($"SteamLibrary/LoadInstalledGames: Found what it thought was an additional steam library {steamLibraryPath} in {_steamConfigVdfFile}, but it didn't exist on the file system, or was already added");
} }
} }
} }
@ -766,7 +770,8 @@ namespace DisplayMagician.GameLibraries
} }
// And we add the Game to the list of games we have! // And we add the Game to the list of games we have!
_allSteamGames.Add(new SteamGame(steamGameId, steamGameName, steamGameExe, steamGameIconPath)); SteamGame gameToAdd = new SteamGame(steamGameId, steamGameName, steamGameExe, steamGameIconPath);
_allSteamGames.Add(gameToAdd);
logger.Debug($"SteamLibrary/LoadInstalledGames: Adding Steam Game with game id {steamGameId}, name {steamGameName}, game exe {steamGameExe} and icon path {steamGameIconPath}"); logger.Debug($"SteamLibrary/LoadInstalledGames: Adding Steam Game with game id {steamGameId}, name {steamGameName}, game exe {steamGameExe} and icon path {steamGameIconPath}");
} }
} }

4
DisplayMagician/Properties/AssemblyInfo.cs
View File

@ -26,8 +26,8 @@ using System.Resources;
[assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")] [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")]
// Version information // Version information
[assembly: AssemblyVersion("2.1.0.196")] [assembly: AssemblyVersion("2.1.0.201")]
[assembly: AssemblyFileVersion("2.1.0.196")] [assembly: AssemblyFileVersion("2.1.0.201")]
[assembly: NeutralResourcesLanguageAttribute( "en" )] [assembly: NeutralResourcesLanguageAttribute( "en" )]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]

25
DisplayMagician/UIForms/ShortcutForm.Designer.cs generated
View File

@ -301,19 +301,18 @@ namespace DisplayMagician.UIForms
// //
// dv_profile // dv_profile
// //
this.dv_profile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.dv_profile.BackColor = System.Drawing.Color.DimGray; this.dv_profile.BackColor = System.Drawing.Color.DimGray;
this.dv_profile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dv_profile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dv_profile.Dock = System.Windows.Forms.DockStyle.Top;
this.dv_profile.Font = new System.Drawing.Font("Consolas", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dv_profile.Font = new System.Drawing.Font("Consolas", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dv_profile.ForeColor = System.Drawing.Color.MidnightBlue; this.dv_profile.ForeColor = System.Drawing.Color.MidnightBlue;
this.dv_profile.Location = new System.Drawing.Point(0, 0); this.dv_profile.Location = new System.Drawing.Point(3, 3);
this.dv_profile.Margin = new System.Windows.Forms.Padding(18); this.dv_profile.Margin = new System.Windows.Forms.Padding(18);
this.dv_profile.Name = "dv_profile"; this.dv_profile.Name = "dv_profile";
this.dv_profile.PaddingX = 100; this.dv_profile.PaddingX = 100;
this.dv_profile.PaddingY = 100; this.dv_profile.PaddingY = 100;
this.dv_profile.Profile = null; this.dv_profile.Profile = null;
this.dv_profile.Size = new System.Drawing.Size(1082, 467); this.dv_profile.Size = new System.Drawing.Size(1076, 472);
this.dv_profile.TabIndex = 23; this.dv_profile.TabIndex = 23;
// //
// tabp_audio // tabp_audio
@ -327,7 +326,7 @@ namespace DisplayMagician.UIForms
this.tabp_audio.Location = new System.Drawing.Point(4, 32); this.tabp_audio.Location = new System.Drawing.Point(4, 32);
this.tabp_audio.Name = "tabp_audio"; this.tabp_audio.Name = "tabp_audio";
this.tabp_audio.Padding = new System.Windows.Forms.Padding(3); this.tabp_audio.Padding = new System.Windows.Forms.Padding(3);
this.tabp_audio.Size = new System.Drawing.Size(1082, 731); this.tabp_audio.Size = new System.Drawing.Size(1082, 713);
this.tabp_audio.TabIndex = 4; this.tabp_audio.TabIndex = 4;
this.tabp_audio.Text = "2. Choose Audio"; this.tabp_audio.Text = "2. Choose Audio";
// //
@ -340,7 +339,7 @@ namespace DisplayMagician.UIForms
this.lbl_no_active_capture_devices.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.lbl_no_active_capture_devices.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.lbl_no_active_capture_devices.ForeColor = System.Drawing.Color.White; this.lbl_no_active_capture_devices.ForeColor = System.Drawing.Color.White;
this.lbl_no_active_capture_devices.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.lbl_no_active_capture_devices.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.lbl_no_active_capture_devices.Location = new System.Drawing.Point(126, 456); this.lbl_no_active_capture_devices.Location = new System.Drawing.Point(126, 438);
this.lbl_no_active_capture_devices.Name = "lbl_no_active_capture_devices"; this.lbl_no_active_capture_devices.Name = "lbl_no_active_capture_devices";
this.lbl_no_active_capture_devices.Size = new System.Drawing.Size(831, 22); this.lbl_no_active_capture_devices.Size = new System.Drawing.Size(831, 22);
this.lbl_no_active_capture_devices.TabIndex = 36; this.lbl_no_active_capture_devices.TabIndex = 36;
@ -357,7 +356,7 @@ namespace DisplayMagician.UIForms
this.lbl_no_active_audio_devices.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.lbl_no_active_audio_devices.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.lbl_no_active_audio_devices.ForeColor = System.Drawing.Color.White; this.lbl_no_active_audio_devices.ForeColor = System.Drawing.Color.White;
this.lbl_no_active_audio_devices.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.lbl_no_active_audio_devices.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.lbl_no_active_audio_devices.Location = new System.Drawing.Point(131, 162); this.lbl_no_active_audio_devices.Location = new System.Drawing.Point(131, 153);
this.lbl_no_active_audio_devices.Name = "lbl_no_active_audio_devices"; this.lbl_no_active_audio_devices.Name = "lbl_no_active_audio_devices";
this.lbl_no_active_audio_devices.Size = new System.Drawing.Size(804, 22); this.lbl_no_active_audio_devices.Size = new System.Drawing.Size(804, 22);
this.lbl_no_active_audio_devices.TabIndex = 35; this.lbl_no_active_audio_devices.TabIndex = 35;
@ -374,7 +373,7 @@ namespace DisplayMagician.UIForms
this.lbl_disabled_shortcut_audio_chipset.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.lbl_disabled_shortcut_audio_chipset.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.lbl_disabled_shortcut_audio_chipset.ForeColor = System.Drawing.Color.White; this.lbl_disabled_shortcut_audio_chipset.ForeColor = System.Drawing.Color.White;
this.lbl_disabled_shortcut_audio_chipset.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.lbl_disabled_shortcut_audio_chipset.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.lbl_disabled_shortcut_audio_chipset.Location = new System.Drawing.Point(263, 321); this.lbl_disabled_shortcut_audio_chipset.Location = new System.Drawing.Point(263, 303);
this.lbl_disabled_shortcut_audio_chipset.Name = "lbl_disabled_shortcut_audio_chipset"; this.lbl_disabled_shortcut_audio_chipset.Name = "lbl_disabled_shortcut_audio_chipset";
this.lbl_disabled_shortcut_audio_chipset.Size = new System.Drawing.Size(557, 22); this.lbl_disabled_shortcut_audio_chipset.Size = new System.Drawing.Size(557, 22);
this.lbl_disabled_shortcut_audio_chipset.TabIndex = 34; this.lbl_disabled_shortcut_audio_chipset.TabIndex = 34;
@ -990,8 +989,7 @@ namespace DisplayMagician.UIForms
this.p_game.Controls.Add(this.lbl_game_timeout); this.p_game.Controls.Add(this.lbl_game_timeout);
this.p_game.Controls.Add(this.nud_timeout_game); this.p_game.Controls.Add(this.nud_timeout_game);
this.p_game.Controls.Add(this.lbl_game_library); this.p_game.Controls.Add(this.lbl_game_library);
this.p_game.Dock = System.Windows.Forms.DockStyle.Bottom; this.p_game.Location = new System.Drawing.Point(3, 338);
this.p_game.Location = new System.Drawing.Point(3, 339);
this.p_game.Name = "p_game"; this.p_game.Name = "p_game";
this.p_game.Size = new System.Drawing.Size(1076, 389); this.p_game.Size = new System.Drawing.Size(1076, 389);
this.p_game.TabIndex = 7; this.p_game.TabIndex = 7;
@ -1051,15 +1049,14 @@ namespace DisplayMagician.UIForms
// //
// ilv_games // ilv_games
// //
this.ilv_games.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) this.ilv_games.Dock = System.Windows.Forms.DockStyle.Bottom;
| System.Windows.Forms.AnchorStyles.Right)));
this.ilv_games.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ilv_games.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ilv_games.IntegralScroll = true; this.ilv_games.IntegralScroll = true;
this.ilv_games.Location = new System.Drawing.Point(0, 187); this.ilv_games.Location = new System.Drawing.Point(0, 200);
this.ilv_games.Name = "ilv_games"; this.ilv_games.Name = "ilv_games";
this.ilv_games.PersistentCacheDirectory = ""; this.ilv_games.PersistentCacheDirectory = "";
this.ilv_games.PersistentCacheSize = ((long)(100)); this.ilv_games.PersistentCacheSize = ((long)(100));
this.ilv_games.Size = new System.Drawing.Size(1076, 202); this.ilv_games.Size = new System.Drawing.Size(1076, 189);
this.ilv_games.SortOrder = Manina.Windows.Forms.SortOrder.Ascending; this.ilv_games.SortOrder = Manina.Windows.Forms.SortOrder.Ascending;
this.ilv_games.TabIndex = 28; this.ilv_games.TabIndex = 28;
this.ilv_games.UseWIC = true; this.ilv_games.UseWIC = true;