From 88081faba83556c7269ba63da758a94de7e03a02 Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Sat, 25 Jan 2020 20:33:45 -0600 Subject: [PATCH] Make sure to unsubscribe from events for DupBox Related to issue #1073 --- DS4Windows/DS4Forms/MainWindow.xaml.cs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/DS4Windows/DS4Forms/MainWindow.xaml.cs b/DS4Windows/DS4Forms/MainWindow.xaml.cs index 00d1098..0524989 100644 --- a/DS4Windows/DS4Forms/MainWindow.xaml.cs +++ b/DS4Windows/DS4Forms/MainWindow.xaml.cs @@ -1166,18 +1166,24 @@ Suspend support not enabled.", true); filename = profileListHolder.ProfileListCol[idx].Name; dupBox.OldFilename = filename; dupBoxBar.Visibility = Visibility.Visible; - dupBox.Save += (sender2, profilename) => - { - profileListHolder.AddProfileSort(profilename); - dupBoxBar.Visibility = Visibility.Collapsed; - }; - dupBox.Cancel += (sender2, args) => - { - dupBoxBar.Visibility = Visibility.Collapsed; - }; + dupBox.Save -= DupBox_Save; + dupBox.Cancel -= DupBox_Cancel; + dupBox.Save += DupBox_Save; + dupBox.Cancel += DupBox_Cancel; } } + private void DupBox_Cancel(object sender, EventArgs e) + { + dupBoxBar.Visibility = Visibility.Collapsed; + } + + private void DupBox_Save(DupBox sender, string profilename) + { + profileListHolder.AddProfileSort(profilename); + dupBoxBar.Visibility = Visibility.Collapsed; + } + private void DeleteProfBtn_Click(object sender, RoutedEventArgs e) { if (profilesListBox.SelectedIndex >= 0)