From 4c3f09644a033dbf70258c4c0e5a848263b16bbd Mon Sep 17 00:00:00 2001 From: MutantAura <44103205+MutantAura@users.noreply.github.com> Date: Wed, 12 Apr 2023 20:18:40 +0100 Subject: [PATCH] Move swkbd message null check into constructor (#4671) --- Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs b/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs index 78c62a9a..fb689ec2 100644 --- a/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs +++ b/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs @@ -23,10 +23,11 @@ namespace Ryujinx.Ava.UI.Controls private ContentDialog _host; - public SwkbdAppletDialog(string mainText, string secondaryText, string placeholder) + public SwkbdAppletDialog(string mainText, string secondaryText, string placeholder, string message) { MainText = mainText; SecondaryText = secondaryText; + Message = message ?? ""; DataContext = this; _placeholder = placeholder; InitializeComponent(); @@ -54,10 +55,7 @@ namespace Ryujinx.Ava.UI.Controls UserResult result = UserResult.Cancel; - SwkbdAppletDialog content = new SwkbdAppletDialog(args.HeaderText, args.SubtitleText, args.GuideText) - { - Message = args.InitialText ?? "" - }; + SwkbdAppletDialog content = new SwkbdAppletDialog(args.HeaderText, args.SubtitleText, args.GuideText, args.InitialText); string input = string.Empty;