Ryujinx_Mirror/Ryujinx_GreemDev
1
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx.git synced 2025-01-26 19:23:03 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

misc: chore: Cleanup AppletMetadata usage

Browse source
This commit is contained in:
Evan Husted 2025-01-19 19:40:49 -06:00
parent 09446fd80e
commit bbd64fd5f0
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -38,7 +38,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption; using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
using Ryujinx.HLE.UI; using Ryujinx.HLE.UI;
using Ryujinx.Input.HLE; using Ryujinx.Input.HLE;
using Silk.NET.Vulkan;
using SkiaSharp; using SkiaSharp;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

10
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
View file

@ -144,14 +144,14 @@ namespace Ryujinx.Ava.UI.Views.Main
ViewModel.LoadConfigurableHotKeys(); ViewModel.LoadConfigurableHotKeys();
} }
public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009); public AppletMetadata MiiApplet => new(ViewModel.ContentManager, "miiEdit", 0x0100000000001009);
public async Task OpenMiiApplet() public async Task OpenMiiApplet()
{ {
if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData)) if (!MiiApplet.CanStart(out var appData, out var nacpData))
{ return;
await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
} await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
} }
public async Task OpenCheatManagerForCurrentApp() public async Task OpenCheatManagerForCurrentApp()

4
src/Ryujinx/Utilities/AppletMetadata.cs
View file

@ -54,5 +54,9 @@ namespace Ryujinx.Ava.Utilities
appControl = new BlitStruct<ApplicationControlProperty>(0); appControl = new BlitStruct<ApplicationControlProperty>(0);
return false; return false;
} }
public bool CanStart(out ApplicationData appData,
out BlitStruct<ApplicationControlProperty> appControl)
=> CanStart(null, out appData, out appControl);
} }
} }