diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs index 5eadf2187..3399b1226 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs @@ -182,7 +182,7 @@ namespace Flow.Launcher.Plugin.WebSearch (Math.Abs(diff.X) > SystemParameters.MinimumHorizontalDragDistance || Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance)) { - ListView listView = sender as ListView; + var listView = (ListView)sender; ListViewItem listViewItem = FindAncestor((DependencyObject)e.OriginalSource); if (listViewItem == null) return; @@ -199,7 +199,7 @@ namespace Flow.Launcher.Plugin.WebSearch if (e.Data.GetDataPresent(typeof(SearchSource))) { SearchSource droppedData = e.Data.GetData(typeof(SearchSource)) as SearchSource; - ListView listView = sender as ListView; + var listView = (ListView)sender; var target = GetNearestContainer(e.OriginalSource); if (target == null) @@ -207,6 +207,9 @@ namespace Flow.Launcher.Plugin.WebSearch SearchSource targetData = (SearchSource)listView.ItemContainerGenerator.ItemFromContainer(target); + if (targetData == null) + return; + var items = _settings.SearchSources; int removedIdx = items.IndexOf(droppedData); int targetIdx = items.IndexOf(targetData);