Log Control's unsubscribe from the event when unloaded

Author: umairsyed613

src/Serilog.Sinks.WPF/JsonTextBoxSink.xaml

@@ -1,11 +1,12 @@
 <UserControl x:Class="Serilog.Sinks.WPF.JsonTextBoxSink"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Serilog.Sinks.WPF"
              mc:Ignorable="d"
              Loaded="JsonTextBoxSink_OnLoaded"
+             Unloaded="JsonTextBoxSink_OnUnloaded"
              Height="auto" Width="auto">
     <Grid>
         <DockPanel>

src/Serilog.Sinks.WPF/JsonTextBoxSink.xaml.cs

@@ -67,5 +67,10 @@ private void JsonTextBoxSink_OnLogReceived(string str)
                             }));
             }
         }
+
+        private void JsonTextBoxSink_OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            WindFormsSink.JsonTextBoxSink.OnLogReceived -= JsonTextBoxSink_OnLogReceived;
+        }
     }
 }

src/Serilog.Sinks.WPF/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]

src/Serilog.Sinks.WPF/SimpleLogTextBox.xaml

@@ -1,11 +1,12 @@
 <UserControl x:Class="Serilog.Sinks.WPF.SimpleLogTextBox"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Serilog.Sinks.WPF"
              mc:Ignorable="d"
              Loaded="SimpleLogTextBox_OnLoaded"
+             Unloaded="SimpleLogTextBox_OnUnloaded"
              Height="auto" Width="auto">
     <Grid>
             <DockPanel>

src/Serilog.Sinks.WPF/SimpleLogTextBox.xaml.cs

@@ -36,14 +36,14 @@ private void SimpleLogTextBox_OnLoaded(object sender, RoutedEventArgs e)
                 Dispatcher.BeginInvoke(
                     new Action(
                         delegate
-                            {
-                                LogTextBox.VerticalScrollBarVisibility = ScrollBarVisibility;
-                                LogTextBox.IsReadOnly = IsReadyOnly;
-                                LogTextBox.FontFamily = FontFamily;
-                                LogTextBox.FontSize = FontSize;
-                                LogTextBox.FontStyle = FontStyle;
-                                LogTextBox.FontWeight = FontWeight;
-                            }));
+                        {
+                            LogTextBox.VerticalScrollBarVisibility = ScrollBarVisibility;
+                            LogTextBox.IsReadOnly = IsReadyOnly;
+                            LogTextBox.FontFamily = FontFamily;
+                            LogTextBox.FontSize = FontSize;
+                            LogTextBox.FontStyle = FontStyle;
+                            LogTextBox.FontWeight = FontWeight;
+                        }));
             }
 
             WindFormsSink.SimpleTextBoxSink.OnLogReceived += SimpleTextBoxSink_OnLogReceived;
@@ -62,11 +62,16 @@ private void SimpleTextBoxSink_OnLogReceived(string str)
                     System.Windows.Threading.DispatcherPriority.Normal,
                     new Action(
                         delegate
-                            {
-                                LogTextBox.Text += str;
-                                LogTextBox.ScrollToEnd();
-                            }));
+                        {
+                            LogTextBox.Text += str;
+                            LogTextBox.ScrollToEnd();
+                        }));
             }
         }
+
+        private void SimpleLogTextBox_OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            WindFormsSink.SimpleTextBoxSink.OnLogReceived -= SimpleTextBoxSink_OnLogReceived;
+        }
     }
 }

src/Serilog.Sinks.WPF/WinFormsSinkInternal.cs

@@ -14,12 +14,9 @@ public class WinFormsSinkInternal : ILogEventSink
 
         public event LogHandler OnLogReceived;
 
-        private ITextFormatter _textFormatter;
+        private readonly ITextFormatter _textFormatter;
 
-        public WinFormsSinkInternal(ITextFormatter textFormatter)
-        {
-            _textFormatter = textFormatter ?? throw new ArgumentNullException(nameof(textFormatter));
-        }
+        public WinFormsSinkInternal(ITextFormatter textFormatter) => _textFormatter = textFormatter ?? throw new ArgumentNullException(nameof(textFormatter));
 
         public void Emit(LogEvent logEvent)
         {