From c86cec1a1e0eeaec06d67ff86973d1fb16cfb10d Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Thu, 25 May 2023 14:21:53 +0200
Subject: [PATCH] ANIM Editor - use '|=' instead when applying template anim

---
 PCK-Studio/Forms/Editor/ANIMEditor.cs                   | 2 +-
 PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx | 3 ---
 PCK-Studio/PckStudio.csproj                             | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/PCK-Studio/Forms/Editor/ANIMEditor.cs b/PCK-Studio/Forms/Editor/ANIMEditor.cs
index 4cddf43c..e54ffd5f 100644
--- a/PCK-Studio/Forms/Editor/ANIMEditor.cs
+++ b/PCK-Studio/Forms/Editor/ANIMEditor.cs
@@ -341,7 +341,7 @@ namespace PckStudio.Forms.Editor
             var templateANIM = new SkinANIM(Templates[diag.SelectedItem]);
             DialogResult prompt = MessageBox.Show(this, "Would you like to add this preset's effects to your current ANIM? Otherwise all of your effects will be cleared. Either choice can be undone by pressing \"Restore ANIM\".", "", MessageBoxButtons.YesNo);
             if (prompt == DialogResult.Yes)
-                templateANIM = ruleset.Value | templateANIM;
+                templateANIM |= ruleset.Value;
             ruleset.ApplyAnim(templateANIM);
         }
 
diff --git a/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx b/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx
index ab1b49e0..9b5d83ba 100644
--- a/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx
+++ b/PCK-Studio/Forms/Utilities/AppBehaviorSettingsForm.resx
@@ -120,7 +120,4 @@
   <metadata name="SettingToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="SettingToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
\ No newline at end of file
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 1cb9a8d4..dc36ec64 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -589,6 +589,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Utilities\AppBehaviorSettingsForm.resx">
       <DependentUpon>AppBehaviorSettingsForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="MainForm.ja.resx">
       <DependentUpon>MainForm.cs</DependentUpon>