Fix crash when trying to edit note in filtered view

segabl · May 6, 2021 · a62e080 · a62e080
1 parent aa5ea2e
commit a62e080
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -12,6 +12,7 @@
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Media;
 using MessageBox = AdonisUI.Controls.MessageBox;
 using MessageBoxButton = AdonisUI.Controls.MessageBoxButton;
@@ -33,6 +34,7 @@ public partial class MainWindow : AdonisWindow {
 		private SoundBank soundBank;
 		private Button playingButton;
 		private bool converterAvailable;
+		private CollectionViewSource soundBankViewSource = new CollectionViewSource();
 
 		public bool UpdateCheckEnabled { get => appSettings.checkForUpdates; set => appSettings.checkForUpdates = value; }
 
@@ -177,15 +179,15 @@ private void OnReplaceButtonClick(object sender, RoutedEventArgs e) {
 
 		private void OnFilterTextBoxChanged(object sender, RoutedEventArgs e) {
 			var text = (sender as TextBox).Text;
+			var view = soundBankViewSource.View;
 			if (text.Length > 0) {
 				var rx = new Regex(text, RegexOptions.Compiled);
-				var filtered = soundBank.StreamInfos.Where(info => rx.Match(info.Note).Success || rx.Match(info.Id.ToString()).Success);
-				dataGrid.ItemsSource = filtered;
-				dataGrid.DataContext = filtered;
+				view.Filter = new Predicate<object>(info => rx.Match((info as StreamInfo).Note).Success || rx.Match((info as StreamInfo).Id.ToString()).Success);
 			} else {
-				dataGrid.ItemsSource = soundBank.StreamInfos;
-				dataGrid.DataContext = soundBank.StreamInfos;
+				view.Filter = null;
 			}
+			dataGrid.ItemsSource = view;
+			dataGrid.DataContext = view;
 		}
 
 		private void OnPlayButtonClick(object sender, RoutedEventArgs e) {
@@ -309,6 +311,8 @@ public void OnSoundBankLoaded(object sender, RunWorkerCompletedEventArgs e) {
 				return;
 			}
 
+			soundBankViewSource.Source = soundBank.StreamInfos;
+
 			if (appSettings.recentlyOpenedFiles.Contains(soundBank.FilePath)) {
 				appSettings.recentlyOpenedFiles.Remove(soundBank.FilePath);
 			}

diff --git a/PD2SoundBankEditor.csproj b/PD2SoundBankEditor.csproj
@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <StartupObject></StartupObject>
     <AssemblyName>PD2SoundBankEditor</AssemblyName>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>