aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Utilities
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2020-01-06 19:27:50 -0300
committerThog <thog@protonmail.com>2020-01-09 02:13:00 +0100
commit29a825b43b8455159ea31ca570a1fe6e6195997f (patch)
treebdf4afe88d7e4b543215a4325e0a61ac4c65088e /Ryujinx.Common/Utilities
parent912e43e9795309de675faefd628b209a27af8add (diff)
Address PR feedback
Removes a useless null check Aligns some values to improve readability
Diffstat (limited to 'Ryujinx.Common/Utilities')
-rw-r--r--Ryujinx.Common/Utilities/EmbeddedResources.cs17
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