diff options
Diffstat (limited to 'Ryujinx.Common/Utilities')
| -rw-r--r-- | Ryujinx.Common/Utilities/EmbeddedResources.cs | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Ryujinx.Common/Utilities/EmbeddedResources.cs b/Ryujinx.Common/Utilities/EmbeddedResources.cs index caa17187..97f349c1 100644 --- a/Ryujinx.Common/Utilities/EmbeddedResources.cs +++ b/Ryujinx.Common/Utilities/EmbeddedResources.cs @@ -33,7 +33,9 @@ namespace Ryujinx.Common using (var stream = GetStream(assembly, filename)) { if (stream == null) + { return null; + } using (var mem = new MemoryStream()) { @@ -49,7 +51,9 @@ namespace Ryujinx.Common using (var stream = GetStream(assembly, filename)) { if (stream == null) + { return null; + } using (var mem = new MemoryStream()) { @@ -79,7 +83,9 @@ namespace Ryujinx.Common using (var stream = GetStream(assembly, filename)) { if (stream == null) + { return null; + } using (var reader = new StreamReader(stream)) { @@ -93,7 +99,9 @@ namespace Ryujinx.Common using (var stream = GetStream(assembly, filename)) { if (stream == null) + { return null; + } using (var reader = new StreamReader(stream)) { @@ -104,7 +112,7 @@ namespace Ryujinx.Common public static Stream GetStream(string filename) { - var (assembly, path) = ResolveManifestPath(filename); + var (assembly, _) = ResolveManifestPath(filename); return GetStream(assembly, filename); } @@ -116,9 +124,6 @@ namespace Ryujinx.Common var stream = assembly.GetManifestResourceStream(manifestUri); - if (stream == null) - return null; - return stream; } @@ -131,11 +136,13 @@ namespace Ryujinx.Common foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { if (assembly.GetName().Name == segments[0]) + { return (assembly, segments[1]); + } } } - return (EmbeddedResources.ResourceAssembly, filename); + return (ResourceAssembly, filename); } } }
\ No newline at end of file |