From 074965bd1ca323ea3256b7ce33d56d9f55885ff0 Mon Sep 17 00:00:00 2001
From: OV2 <OV2@sessionclan.de>
Date: Tue, 1 May 2018 00:07:39 +0200
Subject: [PATCH] win32: move S9xCheatsEnable to PostRomInit

---
 win32/wsnes9x.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index 4ac3520d..f2ad1480 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -4060,8 +4060,6 @@ static bool LoadROMPlain(const TCHAR *filename)
     if (Memory.LoadROM (_tToChar(filename)))
     {
 		S9xStartCheatSearch (&Cheat);
-		if (Settings.ApplyCheats)
-			S9xCheatsEnable();
         ReInitSound();
 		ResetFrameTimer();
         return (TRUE);
@@ -4075,8 +4073,6 @@ static bool LoadROMMulti(const TCHAR *filename, const TCHAR *filename2)
 	if (Memory.LoadMultiCart(_tToChar(filename), _tToChar(filename2)))
 	{
 		S9xStartCheatSearch(&Cheat);
-		if (Settings.ApplyCheats)
-			S9xCheatsEnable();
 		ReInitSound();
 		ResetFrameTimer();
 		return (TRUE);
@@ -10670,6 +10666,7 @@ void S9xPostRomInit()
 	// a lingering cheat they don't realize is on
 	if (Settings.ApplyCheats)
 	{
+		S9xCheatsEnable();
 		extern struct SCheatData Cheat;
 	    for (uint32 i = 0; i < Cheat.g.size(); i++)
 		{