From 3499207db67f82edec4b746c299644cf6e5e5f25 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Wed, 3 Jun 2009 15:32:51 +0000
Subject: [PATCH] fix crash in cheat search involving loading state in the
 middle of a search session

---
 desmume/src/cheatSystem.cpp  | 4 ++++
 desmume/src/windows/main.cpp | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/desmume/src/cheatSystem.cpp b/desmume/src/cheatSystem.cpp
index 2b2606b6f..f383a62c6 100644
--- a/desmume/src/cheatSystem.cpp
+++ b/desmume/src/cheatSystem.cpp
@@ -792,6 +792,10 @@ void cheatsSearchInit(u8 type, u8 size, u8 sign)
 
 void cheatsSearchClose()
 {
+#ifdef _MSC_VER
+	void CheatsSearchReset();
+	CheatsSearchReset();
+#endif
 	if (searchStatMem) delete [] searchStatMem;
 	searchStatMem = NULL;
 
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 41504f1e1..4c4599c14 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -3727,7 +3727,6 @@ LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, L
 
 						if(romloaded)
 						{
-							CheatsSearchReset();
 							NDS_Reset();
 						}
 					}
@@ -3960,7 +3959,6 @@ LRESULT CALLBACK WifiSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 
 						if(romloaded)
 						{
-							CheatsSearchReset();
 							NDS_Reset();
 						}
 					}
@@ -4100,7 +4098,6 @@ LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARA
 
 void ResetGame()
 {
-	CheatsSearchReset();
 	NDS_Reset();
 }