emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Replacing the try-catch block with null-conditional and null-coalescing operators (#6612)

Browse source 
* Replacing the try-catch block with null-conditional and null-coalescing operators

* repeating
This commit is contained in:
Marco Carvalho 2024-04-07 16:49:14 -03:00 committed by GitHub
parent 451a28afb8
commit 0b55914864
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Ryujinx.HLE/HOS/ModLoader.cs
View file

@ -172,37 +172,17 @@ namespace Ryujinx.HLE.HOS
Mod<DirectoryInfo> mod = new("", null, true); Mod<DirectoryInfo> mod = new("", null, true);
if (StrEquals(RomfsDir, modDir.Name)) if (StrEquals(RomfsDir, modDir.Name))
{
bool enabled;
try
{ {
var modData = modMetadata.Mods.Find(x => modDir.FullName.Contains(x.Path)); var modData = modMetadata.Mods.Find(x => modDir.FullName.Contains(x.Path));
enabled = modData.Enabled; var enabled = modData?.Enabled ?? true;
}
catch
{
// Mod is not in the list yet. New mods should be enabled by default.
enabled = true;
}
mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled)); mods.RomfsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled));
types.Append('R'); types.Append('R');
} }
else if (StrEquals(ExefsDir, modDir.Name)) else if (StrEquals(ExefsDir, modDir.Name))
{
bool enabled;
try
{ {
var modData = modMetadata.Mods.Find(x => modDir.FullName.Contains(x.Path)); var modData = modMetadata.Mods.Find(x => modDir.FullName.Contains(x.Path));
enabled = modData.Enabled; var enabled = modData?.Enabled ?? true;
}
catch
{
// Mod is not in the list yet. New mods should be enabled by default.
enabled = true;
}
mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled)); mods.ExefsDirs.Add(mod = new Mod<DirectoryInfo>(dir.Name, modDir, enabled));
types.Append('E'); types.Append('E');