From 03f82226cf9b63265caca5855b77f6fed89beb04 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 1 Oct 2020 22:20:56 +1000 Subject: [PATCH] Cleanup GetRelativePath after move from MultiDiskBundler fixes 5d001f3aa --- src/BizHawk.Common/Extensions/PathExtensions.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Common/Extensions/PathExtensions.cs b/src/BizHawk.Common/Extensions/PathExtensions.cs index 6c644d89cd..9c579375b1 100644 --- a/src/BizHawk.Common/Extensions/PathExtensions.cs +++ b/src/BizHawk.Common/Extensions/PathExtensions.cs @@ -47,14 +47,15 @@ namespace BizHawk.Common.PathExtensions return false; } - /// running on Windows host, and unmanaged call failed + /// running on Windows host, and unmanaged call failed /// running on Windows host, and either path is not a regular file or directory /// Algorithm for Windows taken from https://stackoverflow.com/a/485516/7467292 - public static string GetRelativePath(string fromPath, string toPath) + public static string? GetRelativePath(string? fromPath, string? toPath) { + if (fromPath == null || toPath == null) return null; if (OSTailoredCode.IsUnixHost) return fromPath.MakeRelativeTo(toPath); - //TODO merge this with the Windows implementation in PathExtensions.MakeRelativeTo + //TODO merge this with the Windows implementation in MakeRelativeTo static FileAttributes GetPathAttribute(string path1) { var di = new DirectoryInfo(path1.Split('|').First());