Fixed a crash on exit caused by a null SelectedBlockViewModel

This commit is contained in:
Ben Wallis 2018-09-30 14:02:47 +01:00
parent a0191576f0
commit f238bbf856
3 changed files with 5 additions and 6 deletions

View File

@ -9,9 +9,7 @@
<description>A Path of Exile loot filter script editor</description>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>Copyright 2018</copyright>
<releaseNotes>* Fixed the Block Output Preview pane not working
* The Block Output Preview pane now supports previewing multiple selected blocks
* The Block Output Preview pane now supports selecting the text within it</releaseNotes>
<releaseNotes>* Fixed crash on exit</releaseNotes>
<dependencies />
</metadata>
<files>

View File

@ -10,8 +10,8 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.0.1")]
[assembly: AssemblyInformationalVersion("1.0.1")]
[assembly: AssemblyVersion("1.0.2")]
[assembly: AssemblyInformationalVersion("1.0.2")]
[assembly: InternalsVisibleTo("Filtration.Tests")]
[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]

View File

@ -57,7 +57,8 @@ namespace Filtration.ViewModels.ToolPanes
private void OnLastSelectedBlockChanged(object sender, EventArgs e)
{
if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.SelectedBlockViewModels == null ||
AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.Count == 0)
AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.Count == 0 ||
AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.FirstOrDefault() == null)
{
PreviewText = string.Empty;
return;