mirrors/ryujinx
0
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-12-12 07:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
GreemDev 2025-11-24 20:51:12 -06:00
parent 07834ad4a2
commit f566a4d921
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
View file

@ -1,8 +1,8 @@
using Avalonia.Controls.Notifications;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.Systems.Configuration; using Ryujinx.Ava.Systems.Configuration;
using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.SetupWizard.Pages; using Ryujinx.Ava.UI.SetupWizard.Pages;
using Ryujinx.Ava.UI.Windows;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.SetupWizard namespace Ryujinx.Ava.UI.SetupWizard
@ -17,7 +17,8 @@ namespace Ryujinx.Ava.UI.SetupWizard
public async Task Start() public async Task Start()
{ {
NotificationHelper = new NotificationHelper(wizardWindow); // I wanted to do bottom center but that...literally just shows top center? Okay.
Notification = new NotificationHelper(wizardWindow, NotificationPosition.TopCenter);
RyujinxSetupWizardWindow.IsOpen = true; RyujinxSetupWizardWindow.IsOpen = true;
Start: Start:
await FirstPage() await FirstPage()
@ -37,17 +38,19 @@ namespace Ryujinx.Ava.UI.SetupWizard
goto Keys; goto Keys;
Return: Return:
NotificationHelper = null; if (_configWasModified)
ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.GlobalConfigurationPath);
Notification = null;
wizardWindow.Close(); wizardWindow.Close();
RyujinxSetupWizardWindow.IsOpen = false; RyujinxSetupWizardWindow.IsOpen = false;
if (_configWasModified)
ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.GlobalConfigurationPath);
} }
private async ValueTask<bool> SetupKeys() private async ValueTask<bool> SetupKeys()
{ {
if (!_mainWindow.VirtualFileSystem.HasKeySet) if (overwriteMode || !RyujinxApp.MainWindow.VirtualFileSystem.HasKeySet)
{ {
Retry: Retry:
bool result = await NextPage() bool result = await NextPage()
@ -67,11 +70,11 @@ namespace Ryujinx.Ava.UI.SetupWizard
private async ValueTask<bool> SetupFirmware() private async ValueTask<bool> SetupFirmware()
{ {
if (!HasFirmware) if (overwriteMode || !HasFirmware)
{ {
if (!_mainWindow.VirtualFileSystem.HasKeySet) if (!RyujinxApp.MainWindow.VirtualFileSystem.HasKeySet)
{ {
NotificationHelper.ShowError("Keys still seem to not be installed. Please try again."); Notification.NotifyError("Keys still seem to not be installed. Please try again.");
return false; return false;
} }