From fcf74765cdaee05d81c2336b64ad5b751223b09d Mon Sep 17 00:00:00 2001
From: UnlimitedHugs <unlimited.hugs@gmail.com>
Date: Wed, 4 Jan 2017 17:56:19 +0400
Subject: [PATCH] 2.5.4: Minor fix - Fixed global hotkeys no longer working
 after loading a game twice

---
 Mods/AllowTool/About/About.xml          |   2 +-
 Mods/AllowTool/Assemblies/AllowTool.dll | Bin 22016 -> 22016 bytes
 Properties/AssemblyInfo.cs              |   4 ++--
 Source/AllowToolController.cs           |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mods/AllowTool/About/About.xml b/Mods/AllowTool/About/About.xml
index 2aaf1dc..634d79d 100644
--- a/Mods/AllowTool/About/About.xml
+++ b/Mods/AllowTool/About/About.xml
@@ -4,7 +4,7 @@
 	<author>UnlimitedHugs</author>
 	<targetVersion>0.16.0</targetVersion>
 	<url>https://ludeon.com/forums/index.php?topic=17218.0</url>
-	<description>Version: 2.5.3
+	<description>Version: 2.5.4
 
 &lt;size=20&gt;Description&lt;/size&gt;
 A set of tools to make handling forbidden items easier.
diff --git a/Mods/AllowTool/Assemblies/AllowTool.dll b/Mods/AllowTool/Assemblies/AllowTool.dll
index 052bfcd9991258169e661c6b1aea225a301633b3..b3582f74e67efd4436c3931201e7f6f8ef1890e9 100644
GIT binary patch
delta 472
zcmXX?O-NKx6#mY8_rCYWo;34%gyOu$Ck2yfB+WubBf(7zD~kvMH(@R!V?f=_2vd;+
zp*7rvi&-iRk}bxIizK0iPP8e)mgc4(bY&P4F0{@Y+T8DaKj(aKi;GlTq?gakgQL;v
zbKmrD!$`*g3r5}mL@o(5sEXNkIpE>gxzMBZDV`c&<t_HDyc4BTEah6FHE^Jnnd@|Z
z**fmg(Mdkjk_(k1lFnxWY#^b#g-w)Feewx~YE2HtxDpT9om7FfO(|{J^9F_bRqRiU
zVeUi|F}(HrB*S6zu4zAZxdbcvcd%~;%OS6$hE<~%Cf@yLAL^__%eGIltKjy+#k9Lc
zKFaPdN}|HAkE&ZliE8Yg#-<xLIylp6WKdQzJwjFWAYHK|WdLQ}eD(}oipWI$L<xa2
zBX(%jdn1Mr72K;A6zc8}-h1of5jMP!?0)q&L;+QmZ=a-sK4`yhkkG@OiALE!I&ybR
zjc2dwS~lAlw|Az#{e1nje`zkaw|Qscg^ph-T9nbHYljpQkl^ox(6fUHVs+t04}<z~
S^P<e)JT9p4`gcvY{?b1}wt1)k

delta 510
zcmXX?J!n%=7(L&8e@VPG$!jQ<^u_n$56@^N5~sFGz@<aARUEsB%^)fP>7t1kacGMm
zhHG>dg;LT*ZWqBq2dj0_p^j}9E9g{Fq&U?2z2F_rx#!&ToqM^BMQSY4<5}bB?WtD}
zGe+zvM3@3>rH%Z(0U)vOc;Hg#@h$<oW&@^Oi!oMnY*n)y1vqe!m5dF3?j&9M+b4i*
z)n^MED1f+7U_Xjykp!=7(ZMDG4v>bZaoDT|QMfOGFdx+(V(4|$sJTNqRkj|Guijb{
zaefbO^5C5E>~ECQw)0YuuiNpRIMa*X1H|+uQ?{6P`?n3JE~DBd{mc7pcnf?7@D9sj
z1O}G=s}Eh}Yb*cBIyECZltD}WpaDE*%%CkBXwr%tfy5f)VQk2hIDr}Ii_>T+E38mk
zT@UA-$QeUR_a8e#XCg7(Eo#DxJu<)3visVc>{d+iaEI#M(@DH{SIzracR%v!rn_#|
z(N?v>U0TzB3fBY~`s!f1N8K43v(DY9T)CxJhlYDn6l?|a(<|jCLB5jwa{i}IjW%p5
o>E?x9iW{)_y8%N#n@AJ83m1o()YnTTtAvv%s$hIe)8#$-2f~GUkpKVy

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index cba1501..7275ec3 100644
--- a/Properties/AssemblyInfo.cs
+++ b/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("2.5.3")]
-[assembly: AssemblyFileVersion("2.5.3")]
+[assembly: AssemblyVersion("2.5.4")]
+[assembly: AssemblyFileVersion("2.5.4")]
diff --git a/Source/AllowToolController.cs b/Source/AllowToolController.cs
index 22b6572..22f72bc 100644
--- a/Source/AllowToolController.cs
+++ b/Source/AllowToolController.cs
@@ -57,6 +57,7 @@ public override void OnGUI() {
 
 		public override void DefsLoaded() {
 			PrepareSettingsHandles();
+			activeDesignators.Clear();
 		}
 
 		public override void WorldLoaded() {
@@ -70,7 +71,6 @@ public override void SettingsChanged() {
 		}
 
 		private void InjectDesignators() {
-			activeDesignators.Clear();
 			var numDesignatorsInjected = 0;
 			foreach (var designatorDef in DefDatabase<ThingDesignatorDef>.AllDefs) {
 				if (designatorDef.Injected) continue;