v2.6.2 removes error when pressing pause key too early

pardeike · Nov 12, 2023 · b13fe13 · b13fe13
1 parent 0a7282f
commit b13fe13
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/1.4/Assemblies/CameraPlus.dll b/1.4/Assemblies/CameraPlus.dll
diff --git a/About/About.xml b/About/About.xml
@@ -18,7 +18,7 @@
     </li>
   </modDependencies>
   <packageId>brrainz.cameraplus</packageId>
-  <modVersion>2.6.1.0</modVersion>
+  <modVersion>2.6.2.0</modVersion>
   <steamAppId>867467808</steamAppId>
   <url>https://github.com/pardeike/CameraPlus</url>
   <description>You want more zoom and different paning?

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.cameraplus</identifier>
-  <version>2.6.1.0</version>
+  <version>2.6.2.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
 		<ModName>Camera+</ModName>
 		<ModFileName>CameraPlus</ModFileName>
 		<Repository>https://github.com/pardeike/CameraPlus</Repository>
-		<ModVersion>2.6.1.0</ModVersion>
+		<ModVersion>2.6.2.0</ModVersion>
 		<ProjectGuid>{AC5EE7A1-16EA-498D-B21A-83ACF78F0E5A}</ProjectGuid>
 	</PropertyGroup>
 

diff --git a/Source/CameraPlus.csproj b/Source/CameraPlus.csproj
@@ -45,7 +45,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Brrainz.RimWorld.CrossPromotion" Version="1.1.1" />
-		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3704" GeneratePathProperty="true" />
+		<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3901" GeneratePathProperty="true" />
 		<PackageReference Include="Lib.Harmony" Version="2.2.2" ExcludeAssets="runtime" />
 		<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3">

diff --git a/Source/Main.cs b/Source/Main.cs
@@ -505,6 +505,9 @@ static class KeyBindingDef_KeyDownEvent_Patch
 
 		public static void CleanupAtEndOfFrame()
 		{
+			if (Current.ProgramState != ProgramState.Playing)
+				return;
+
 			if (Event.current.type == EventType.KeyUp && KeyBindingDefOf.TogglePause.IsDown == false)
 				wasDown = false;
 

diff --git a/Source/Tools.cs b/Source/Tools.cs
@@ -145,6 +145,7 @@ public static void DrawDot(Pawn pawn, Color innerColor, Color outerColor)
 				else
 					color = new Color(color32s[0].r / 255f, color32s[0].g / 255f, color32s[0].b / 255f);
 
+				UnityEngine.Object.Destroy(outputTexture);
 				cachedMainColors[key] = color;
 			}
 			return color;
@@ -405,7 +406,7 @@ IEnumerator ApplyRootPosAndSize()
 
 		public static void HandleHotkeys()
 		{
-			if (Event.current.type == EventType.Repaint)
+			if (Event.current.type == EventType.Repaint || Current.ProgramState != ProgramState.Playing)
 				return;
 
 			var settings = CameraPlusMain.Settings;