From 084b822aaf45fb74ea6ac18d6380105c398050e2 Mon Sep 17 00:00:00 2001
From: Ron Smith <htwmmo@gmail.com>
Date: Sun, 4 Feb 2024 09:19:38 -0700
Subject: [PATCH] Moved zone exclusion check to before removal call.

---
 MQ2GMCheck.cpp | 14 +++++++-------
 MQ2GMCheck.rc  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/MQ2GMCheck.cpp b/MQ2GMCheck.cpp
index 945ae8f..93283c8 100644
--- a/MQ2GMCheck.cpp
+++ b/MQ2GMCheck.cpp
@@ -21,7 +21,7 @@
 #include <mq/imgui/ImGuiUtils.h>
 
 PreSetup("MQ2GMCheck");
-PLUGIN_VERSION(5.31);
+PLUGIN_VERSION(5.32);
 
 constexpr const char* PluginMsg = "\ay[\aoMQ2GMCheck\ax] ";
 
@@ -1397,6 +1397,12 @@ PLUGIN_API void OnPulse()
 		waveOutSetVolume(nullptr, dwVolume);
 	}
 
+	// Check if we are in an excluded zone
+	if (IsExcludedZone())
+	{
+		return;
+	}
+
 	if (gGameState == GAMESTATE_INGAME)
 	{
 		duration elapsed = clock::now() - pulsestart;
@@ -1428,12 +1434,6 @@ PLUGIN_API void OnPulse()
 				}), GMNames.end());
 			}
 
-			// Check if we are in an excluded zone
-			if (IsExcludedZone())
-			{
-				return;
-			}
-
 			// Add any GMs that appeared
 			SPAWNINFO* pSpawn = pSpawnList;
 			while (pSpawn) {
diff --git a/MQ2GMCheck.rc b/MQ2GMCheck.rc
index 35af128..6651ad7 100644
--- a/MQ2GMCheck.rc
+++ b/MQ2GMCheck.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,31
- PRODUCTVERSION 5,31
+ FILEVERSION 5,32
+ PRODUCTVERSION 5,32
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,11 +73,11 @@ BEGIN
 #else
             VALUE "FileDescription", "MQ2GMCheck Release Version"
 #endif
-            VALUE "FileVersion", "5.31"
+            VALUE "FileVersion", "5.32"
             VALUE "InternalName", "MQ2GMCheck.dll"
             VALUE "OriginalFilename", "MQ2GMCheck.dll"
             VALUE "ProductName", "MQ2GMCheck"
-            VALUE "ProductVersion", "5.31"
+            VALUE "ProductVersion", "5.32"
         END
     END
     BLOCK "VarFileInfo"