From d882c5fbf6cca1e5c8fb7167d980ecd3cbaf2a3d Mon Sep 17 00:00:00 2001
From: Uleat <uleat.charismata@gmail.com>
Date: Sat, 18 Mar 2017 16:11:07 -0400
Subject: [PATCH] Fix for glitchy mercenary unsuspend button behavior (report
 any abnormalities)

---
 zone/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zone/client.cpp b/zone/client.cpp
index beaa0970c..23a7213a3 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -625,7 +625,7 @@ bool Client::Save(uint8 iCommitNow) {
 		GetMercInfo().MercTimerRemaining = GetMercTimer()->GetRemainingTime();
 	}
 
-	if (!(GetMerc() && !dead)) {
+	if (dead || (!GetMerc() && !GetMercInfo().IsSuspended)) {
 		memset(&m_mercinfo, 0, sizeof(struct MercInfo));
 	}