v3.0.0.49 - Fix blacklist getting wiped sometimes.

e621-ReBot · Jan 31, 2025 · a6baba4 · a6baba4
1 parent f79b64d
commit a6baba4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/e621 ReBot v3/Windows/Window_Blacklist.xaml b/e621 ReBot v3/Windows/Window_Blacklist.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="Blacklist" Height="256" Width="512" WindowStyle="ToolWindow" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" Loaded="Window_Loaded" Closed="Window_Closed">
+        Title="Blacklist" Height="256" Width="512" WindowStyle="ToolWindow" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" Loaded="Window_Loaded" Closing="Window_Closing" Closed="Window_Closed">
 
     <Grid>
         <TextBox x:Name="Blacklist_TextBox" Background="Silver" TextWrapping="NoWrap" HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible" Margin="2" TabIndex="1" ToolTip="Tags can be combined by entering them on the same line, separated by a space.&#xA;Each line is regarded separately.&#xA;Use shortened terms 'e', 'q', 's' for ratings.&#xA;&#xA;Blacklist applies to downloads from e621 via API (pool downloads ignore it)." AcceptsReturn="True" PreviewKeyDown="Blacklist_TextBox_PreviewKeyDown"/>

diff --git a/e621 ReBot v3/Windows/Window_Blacklist.xaml.cs b/e621 ReBot v3/Windows/Window_Blacklist.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
@@ -47,7 +48,7 @@ private void Blacklist_TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
             }
         }
 
-        private void Window_Closed(object sender, EventArgs e)
+        private void Window_Closing(object sender, CancelEventArgs e)
         {
             List<string> NewBlacklist = new List<string>();
             Blacklist_TextBox.Text = Blacklist_TextBox.Text.Trim().ToLower();
@@ -57,6 +58,10 @@ private void Window_Closed(object sender, EventArgs e)
                 if (TBLine.Length > 0) NewBlacklist.Add(TBLine);
             }
             AppSettings.Blacklist = NewBlacklist;
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
             _RefHolder = null;
             Owner.Activate();
         }

diff --git a/e621 ReBot v3/e621 ReBot v3.csproj b/e621 ReBot v3/e621 ReBot v3.csproj
@@ -11,7 +11,7 @@
     <ApplicationIcon>Resources\ReBot_Icon.ico</ApplicationIcon>
     <Platforms>x64</Platforms>
     <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-    <FileVersion>3.0.0.48</FileVersion>
+    <FileVersion>3.0.0.49</FileVersion>
     <StartupObject>e621_ReBot_v3.App</StartupObject>
     <IsPublishable>False</IsPublishable>
     <RepositoryUrl>https://github.com/e621-ReBot/e621-ReBot-v3</RepositoryUrl>