From 3fd0d00ecd4c17091c5d6b8d55a614e644ceade5 Mon Sep 17 00:00:00 2001
From: Dade Lamkins <dade@lamkins.org>
Date: Fri, 15 Dec 2023 17:16:45 -0500
Subject: [PATCH] Fixed SmallInteract showing on loading screens.  Fixed
 kvstore not invalidating when new setting values were added.

---
 State/KvStates.cs            | 2 +-
 UI/Controls/SmallInteract.cs | 1 +
 manifest.json                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/State/KvStates.cs b/State/KvStates.cs
index 0bce168..5f27b43 100644
--- a/State/KvStates.cs
+++ b/State/KvStates.cs
@@ -57,7 +57,7 @@ private async Task FlushKv(GameTime gameTime) {
         }
 
         public string UpsertValue(string key, string value) {
-            bool updated = false;
+            bool updated = !_kvStore.ContainsKey(key);
 
             _kvStore.AddOrUpdate(key, value, (_, existingVal) => {
                 if (existingVal != value) {
diff --git a/UI/Controls/SmallInteract.cs b/UI/Controls/SmallInteract.cs
index 763b2c5..e2a984e 100644
--- a/UI/Controls/SmallInteract.cs
+++ b/UI/Controls/SmallInteract.cs
@@ -103,6 +103,7 @@ public override void DoUpdate(GameTime gameTime) {
         }
 
         protected override void Paint(SpriteBatch spriteBatch, Rectangle bounds) {
+            if (!GameService.GameIntegration.Gw2Instance.IsInGame) return;
             if (!_packState.UserConfiguration.PackAllowInteractIcon.Value) return;
 
             if (_activePathingEntity == null || _activePathingEntity.IsFiltered(EntityRenderTarget.World)) return;
diff --git a/manifest.json b/manifest.json
index 70f3656..e029069 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Pathing",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "namespace": "bh.community.pathing",
   "package": "Pathing.dll",
   "manifest_version": 1,