Przeglądaj źródła

misc: chore: cleanup AppletMetadata.CanStart

Evan Husted 1 rok temu
rodzic
commit
845c86f545
1 zmienionych plików z 12 dodań i 14 usunięć
  1. 12 14
      src/Ryujinx/Utilities/AppletMetadata.cs

+ 12 - 14
src/Ryujinx/Utilities/AppletMetadata.cs

@@ -32,29 +32,27 @@ namespace Ryujinx.Ava.Utilities
 
         public string GetContentPath(ContentManager contentManager)
             => (contentManager ?? _contentManager)
-                .GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
+                ?.GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
 
         public bool CanStart(ContentManager contentManager, out ApplicationData appData,
             out BlitStruct<ApplicationControlProperty> appControl)
         {
             contentManager ??= _contentManager;
-            if (contentManager == null)
-            {
-                appData = null;
-                appControl = new BlitStruct<ApplicationControlProperty>(0);
-                return false;
-            }
+            if (contentManager == null) 
+                goto BadData;
 
-            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
-
-            if (string.IsNullOrEmpty(appData.Path))
-            {
-                appControl = new BlitStruct<ApplicationControlProperty>(0);
-                return false;
-            }
+            string contentPath = GetContentPath(contentManager);
+            if (string.IsNullOrEmpty(contentPath)) 
+                goto BadData;
 
+            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;
+            
+        BadData:
+            appData = null;
+            appControl = new BlitStruct<ApplicationControlProperty>(0);
+            return false;
         }
     }
 }