Fixed a crash on exit caused by a null SelectedBlockViewModel

Filtration/Filtration.nuspec

@@ -9,13 +9,7 @@
     <description>A Path of Exile loot filter script editor</description>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018</copyright>
-    <releaseNotes>Still no 1.0.0 release notes
+    <releaseNotes>* Fixed crash on exit</releaseNotes>
-
-Changes since 1.0.0-beta1:
-
-* Static data (ItemBaseTypes and ItemClasses) is now correctly loaded from embedded resources instead of the legacy text files in appdata
-* Updates to static data files
-* Disabled setting themes for MinimapIcon, PlayEffect and SetFontSize blocks as a temporary fix for issue #68</releaseNotes>
     <dependencies />
   </metadata>
   <files>

Filtration/Properties/AssemblyInfo.cs

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

Filtration/ViewModels/ItemFilterScriptViewModel.cs

@@ -143,6 +143,7 @@ namespace Filtration.ViewModels
             {
                 RaisePropertyChanged(nameof(SelectedBlockViewModels));
                 RaisePropertyChanged(nameof(LastSelectedBlockViewModel));
+                Messenger.Default.Send(new NotificationMessage("LastSelectedBlockChanged"));
             };
             _lastAddedBlocks = new List<IItemFilterBlockViewModelBase>();
             _showAdvanced = Settings.Default.ShowAdvanced;

Filtration/ViewModels/ToolPanes/BlockOutputPreviewViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Windows.Media.Imaging;
 using Filtration.Parser.Interface.Services;
 using GalaSoft.MvvmLight.Messaging;
@@ -28,19 +29,10 @@ namespace Filtration.ViewModels.ToolPanes
 
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
-                switch (message.Notification)
+                if (message.Notification == "LastSelectedBlockChanged")
-                {
+                    OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                    case "LastSelectedBlockChanged":
+                else if (message.Notification == "ActiveDocumentChanged")
-                    {
+                    OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                    case "ActiveDocumentChanged":
-                    {
-                        OnLastSelectedBlockChanged(this, EventArgs.Empty);
-                        break;
-                    }
-                }
             });
 
         }
@@ -49,7 +41,7 @@ namespace Filtration.ViewModels.ToolPanes
 
         public string PreviewText
         {
-            get { return _previewText; }
+            get => _previewText;
             private set
             {
                 _previewText = value;
@@ -64,15 +56,17 @@ namespace Filtration.ViewModels.ToolPanes
 
         private void OnLastSelectedBlockChanged(object sender, EventArgs e)
         {
-            if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.LastSelectedBlockViewModel == null)
+            if (AvalonDockWorkspaceViewModel.ActiveScriptViewModel?.SelectedBlockViewModels == null || 
+                AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.Count == 0 ||
+                AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels.FirstOrDefault() == null)
             {
                 PreviewText = string.Empty;
                 return;
             }
-
+            
-            PreviewText =
+            PreviewText = AvalonDockWorkspaceViewModel.ActiveScriptViewModel.SelectedBlockViewModels
-                _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(
+                .Select(s => _itemFilterBlockTranslator.TranslateItemFilterBlockBaseToString(s.BaseBlock))
-                    AvalonDockWorkspaceViewModel.ActiveScriptViewModel.LastSelectedBlockViewModel.BaseBlock);
+                .Aggregate((prev, curr) => prev + Environment.NewLine + Environment.NewLine + curr);
         }
     }
 }

Filtration/Views/ToolPanes/BlockOutputPreviewView.xaml

@@ -8,6 +8,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
-        <TextBlock Text="{Binding PreviewText}" ToolTip="{Binding PreviewText}" Margin="10" />
+        <TextBox IsReadOnly="True" Text="{Binding PreviewText, Mode=OneWay}" ToolTip="{Binding PreviewText}" Padding="5" Background="Transparent" BorderThickness="0" />
     </Grid>
 </UserControl>

README.md

@@ -2,10 +2,9 @@
 
 Filtration is an editor for Path of Exile item filter scripts.
 
-## Current Release (Released 2018-09-01)
+## Current Release (Released 2018-09-30)
-<b>Installer</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.20/filtration_0.20_setup.exe">filtration_0.20_setup.exe</a>
+<b>Installer</b><br>
-
+<a href="https://github.com/ben-wallis/Filtration/releases/download/1.0.1/Setup.exe">Setup.exe</a>
-<b>Zip File</b> <a href="https://github.com/ben-wallis/Filtration/releases/download/0.20/filtration_0.20.zip">filtration_0.20.zip</a>
 
 ## System Requirements
 Filtration requires .NET Framework 4.6.1 installed.
@@ -25,10 +24,10 @@ If you'd like to make your script fully compatible with Filtration, please take
 ## Screenshots
 
 ##### Main Window
-<img src="http://i.imgur.com/eAsMoSo.png" />
+<img src="https://i.imgur.com/d3tKEab.png" />
 
 ##### Theme Editor
-<img src="http://i.imgur.com/FJWJknO.png" />
+<img src="https://i.imgur.com/Pi9wds1.png" />
 
 ## Contact
 You can find me on irc.freenode.net in #filtration