Merge from master

This commit is contained in:
Alex Barney 2019-03-03 15:13:02 -06:00
commit 8b7de99cf0

View file

@ -14,9 +14,9 @@ namespace Ryujinx.HLE.FileSystem.Content
switch (switchContentPath) switch (switchContentPath)
{ {
case ContentPath.SystemContent: case ContentPath.SystemContent:
return Path.Combine(fileSystem.GetBasePath(), SystemNandPath, "Contents"); return Path.Combine(basePath, SystemNandPath, "Contents");
case ContentPath.UserContent: case ContentPath.UserContent:
return Path.Combine(fileSystem.GetBasePath(), UserNandPath, "Contents"); return Path.Combine(basePath, UserNandPath, "Contents");
case ContentPath.SdCardContent: case ContentPath.SdCardContent:
return Path.Combine(fileSystem.GetSdCardPath(), "Nintendo", "Contents"); return Path.Combine(fileSystem.GetSdCardPath(), "Nintendo", "Contents");
case ContentPath.System: case ContentPath.System: