manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-10 12:49:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dispose stuff

Browse source
This commit is contained in:
Isaac Marovitz 2023-05-19 09:27:25 -04:00 committed by Isaac Marovitz
parent 86fdd76013
commit e51c131fd7
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml.cs
View file

@ -1,3 +1,4 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Input; using Avalonia.Input;
@ -182,8 +183,9 @@ namespace Ryujinx.Ava.UI.Views.Input
return assigner; return assigner;
} }
public void Dispose() protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{ {
base.OnDetachedFromVisualTree(e);
_currentAssigner?.Cancel(); _currentAssigner?.Cancel();
_currentAssigner = null; _currentAssigner = null;
} }

4
src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml.cs
View file

@ -1,3 +1,4 @@
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Primitives; using Avalonia.Controls.Primitives;
using Avalonia.Input; using Avalonia.Input;
@ -198,8 +199,9 @@ namespace Ryujinx.Ava.UI.Views.Input
return assigner; return assigner;
} }
public void Dispose() protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{ {
base.OnDetachedFromVisualTree(e);
_currentAssigner?.Cancel(); _currentAssigner?.Cancel();
_currentAssigner = null; _currentAssigner = null;
} }

2
src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml
View file

@ -29,7 +29,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<views:InputView <views:InputView
Grid.Row="0" Grid.Row="0"
Name="ControllerSettings" /> Name="InputView" />
<StackPanel <StackPanel
Orientation="Vertical" Orientation="Vertical"
Grid.Row="2"> Grid.Row="2">

2
src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs
View file

@ -11,7 +11,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
public void Dispose() public void Dispose()
{ {
ControllerSettings.Dispose(); InputView.Dispose();
} }
} }
} }

2
src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
View file

@ -37,7 +37,7 @@ namespace Ryujinx.Ava.UI.Windows
public void SaveSettings() public void SaveSettings()
{ {
InputPage.ControllerSettings?.SaveCurrentProfile(); InputPage.InputView?.SaveCurrentProfile();
if (Owner is MainWindow window && ViewModel.DirectoryChanged) if (Owner is MainWindow window && ViewModel.DirectoryChanged)
{ {