Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-05 23:08:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

misc: chore: Fix numerous NullReferenceExceptions, InvalidOperationExceptions

Browse Source
This commit is contained in:
KeatonTheBot
2025-06-18 02:25:06 -05:00
parent a90db3464d
commit d2a532f971
90 changed files with 667 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx.Common/Collections/IntervalTree.cs
+5 -2
View File
@@ -318,13 +318,16 @@ namespace Ryujinx.Common.Collections
{
Root = newNode;
}
else if (start.CompareTo(parent.Start) < 0)
else if (parent != null && start.CompareTo(parent.Start) < 0)
{
parent.Left = newNode;
}
else
{
parent.Right = newNode;
if (parent != null)
{
parent.Right = newNode;
}
}
PropagateIncrease(newNode);
src/Ryujinx.Common/Collections/TreeDictionary.cs
+5 -2
View File
@@ -279,13 +279,16 @@ namespace Ryujinx.Common.Collections
{
Root = newNode;
}
else if (key.CompareTo(parent.Key) < 0)
else if (parent != null && key.CompareTo(parent.Key) < 0)
{
parent.Left = newNode;
}
else
{
parent.Right = newNode;
if (parent != null)
{
parent.Right = newNode;
}
}
Count++;
return newNode;
src/Ryujinx.Common/Configuration/AppDataManager.cs
+2 -2
View File
@@ -273,7 +273,7 @@ namespace Ryujinx.Common.Configuration
{
FileSystemInfo resolvedDirectoryInfo =
Directory.ResolveLinkTarget(correctApplicationDataDirectoryPath, true);
string resolvedPath = resolvedDirectoryInfo.FullName;
string resolvedPath = resolvedDirectoryInfo?.FullName;
Logger.Error?.Print(LogClass.Application, $"Please manually move your Ryujinx data from {resolvedPath} to {correctApplicationDataDirectoryPath}, and remove the symlink.");
}
catch (Exception symlinkException)
@@ -297,7 +297,7 @@ namespace Ryujinx.Common.Configuration
{
FileSystemInfo resolvedDirectoryInfo =
Directory.ResolveLinkTarget(correctApplicationDataDirectoryPath, true);
string resolvedPath = resolvedDirectoryInfo.FullName;
string resolvedPath = resolvedDirectoryInfo?.FullName;
Logger.Error?.Print(LogClass.Application, $"Please manually move your Ryujinx data from {resolvedPath} to {correctApplicationDataDirectoryPath}, and remove the symlink.");
}
catch (Exception symlinkException)
src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
{
string propertyName = tempReader.GetString();
if (propertyName.Equals("motion_backend"))
if (propertyName is "motion_backend")
{
tempReader.Read();
src/Ryujinx.Common/Configuration/Hid/JsonInputConfigConverter.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace Ryujinx.Common.Configuration.Hid
{
string propertyName = tempReader.GetString();
if (propertyName.Equals("backend"))
if (propertyName is "backend")
{
tempReader.Read();
src/Ryujinx.Common/Logging/Logger.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace Ryujinx.Common.Logging
public readonly struct Log
{
private static readonly string _homeDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
private static readonly string _homeDirRedacted = Path.Combine(Directory.GetParent(_homeDir).FullName, "[redacted]");
private static readonly string _homeDirRedacted = Path.Combine(Directory.GetParent(_homeDir)?.FullName ?? string.Empty, "[redacted]");
internal readonly LogLevel Level;