From 4fde5d5120dcc24d8800a7a7cfa8cf97a10ed0e7 Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Thu, 26 Apr 2018 13:03:26 -0500
Subject: [PATCH] Update with current byte.

---
 cheats2.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cheats2.cpp b/cheats2.cpp
index a3cf6926..003be910 100644
--- a/cheats2.cpp
+++ b/cheats2.cpp
@@ -429,10 +429,15 @@ void S9xDisableCheat (SCheat *c)
     if (!c->enabled)
         return;
 
-    c->enabled = false;
-
     if (!Cheat.enabled)
+    {
+        c->enabled = false;
         return;
+    }
+
+    /* Make sure we restore the up-to-date written byte */
+    S9xUpdateCheatInMemory (c);
+    c->enabled = false;
 
     if (c->conditional && !c->cond_true)
         return;