mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-23 06:31:21 -08:00
Replacing the try-catch block with null-conditional and null-coalescing operators (#6612)
* Replacing the try-catch block with null-conditional and null-coalescing operators * repeating
This commit is contained in:
parent
451a28afb8
commit
0b55914864
@ -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');
|
||||||
|
Loading…
Reference in New Issue
Block a user