From fa6e05ece9d1a812810185436c348aefcad19084 Mon Sep 17 00:00:00 2001
From: ansstuff <ansstuff@users.sf.net>
Date: Mon, 28 Nov 2011 17:06:38 +0000
Subject: [PATCH] Fix #3444078

---
 src/drivers/win/memview.cpp |  2 +-
 src/drivers/win/window.cpp  | 10 ++++--
 src/input.cpp               | 71 +++++++++++++++++++++++--------------
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp
index 6e0557c6..50048b6a 100644
--- a/src/drivers/win/memview.cpp
+++ b/src/drivers/win/memview.cpp
@@ -1688,7 +1688,7 @@ void DoMemView() {
 	//static RECT al;
 
 	if (!GameInfo) {
-		FCEUD_PrintError("You must have a game loaded before you can use the Memory Viewer.");
+		FCEUD_PrintError("You must have a game loaded before you can use the Hex Editor.");
 		return;
 	}
 	//if (GameInfo->type==GIT_NSF) {
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index 5f929e15..9f3c1598 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -2900,13 +2900,17 @@ void SaveMovieAs()
 
 void OpenRamSearch()
 {
-	reset_address_info();
-	RamSearchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMSEARCH), MainhWnd, (DLGPROC) RamSearchProc);
+	if (GameInfo)
+	{
+		reset_address_info();
+		RamSearchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMSEARCH), MainhWnd, (DLGPROC) RamSearchProc);
+	}
 }
 
 void OpenRamWatch()
 {
-	RamWatchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMWATCH), MainhWnd, (DLGPROC) RamWatchProc);
+	if (GameInfo)
+		RamWatchHWnd = CreateDialog(fceu_hInstance, MAKEINTRESOURCE(IDD_RAMWATCH), MainhWnd, (DLGPROC) RamWatchProc);
 }
 
 void SaveSnapshotAs()
diff --git a/src/input.cpp b/src/input.cpp
index d8444b28..7abf6b5b 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -752,7 +752,7 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
 	{ EMUCMD_MISC_DISPLAY_BG_TOGGLE,		EMUCMDTYPE_MISC,	BackgroundDisplayToggle, 0, 0, "Toggle Background Display", 0 },
 	{ EMUCMD_MISC_DISPLAY_OBJ_TOGGLE,		EMUCMDTYPE_MISC,	ObjectDisplayToggle, 0, 0, "Toggle Object Display", 0 },
 	{ EMUCMD_MISC_DISPLAY_LAGCOUNTER_TOGGLE,EMUCMDTYPE_MISC,	LagCounterToggle, 0, 0, "Lag Counter Toggle", EMUCMDFLAG_TASEDIT },
-	{ EMUCMD_MISC_OPENTASEDIT,				EMUCMDTYPE_TOOL,	LaunchTasEdit,  0, 0, "Open TAS Edit", 0},
+	{ EMUCMD_MISC_OPENTASEDIT,				EMUCMDTYPE_TOOL,	LaunchTasEdit,  0, 0, "Open TAS Editor", 0},
 	{ EMUCMD_TOOL_OPENMEMORYWATCH,			EMUCMDTYPE_TOOL,	LaunchMemoryWatch,0, 0, "Open Memory Watch", EMUCMDFLAG_TASEDIT },
 	{ EMUCMD_TOOL_OPENCHEATS,				EMUCMDTYPE_TOOL,	LaunchCheats,	  0, 0, "Open Cheats", 0},
 	{ EMUCMD_TOOL_OPENDEBUGGER,				EMUCMDTYPE_TOOL,	LaunchDebugger,   0, 0, "Open Debugger", 0},
@@ -776,7 +776,7 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
 	{ EMUCMD_TOOL_RAMSEARCHGTE,				EMUCMDTYPE_TOOL,	RamSearchOpGTE,	  0, 0, "Ram Search - Greater Than or Equal", 0},
 	{ EMUCMD_TOOL_RAMSEARCHEQ,				EMUCMDTYPE_TOOL,	RamSearchOpEQ,	  0, 0, "Ram Search - Equal",	  0},
 	{ EMUCMD_TOOL_RAMSEARCHNE,				EMUCMDTYPE_TOOL,	RamSearchOpNE,	  0, 0, "Ram Search - Not Equal", 0},
-	{ EMUCMD_TASEDIT_REWIND,				EMUCMDTYPE_TOOL,	TaseditRewindOn, TaseditRewindOff, 0, "Rewind Frame (Tasedit-only)", EMUCMDFLAG_TASEDIT},
+	{ EMUCMD_TASEDIT_REWIND,				EMUCMDTYPE_TOOL,	TaseditRewindOn, TaseditRewindOff, 0, "Rewind Frame (TASEditor-only)", EMUCMDFLAG_TASEDIT},
 	{ EMUCMD_RERECORD_DISPLAY_TOGGLE,		EMUCMDTYPE_MISC,	FCEUI_MovieToggleRerecordDisplay, 0, 0, "Toggle Rerecord Display", EMUCMDFLAG_TASEDIT },
 };
 
@@ -1017,58 +1017,75 @@ static void LaunchRamSearch(void)
 #endif
 }
 
-
 static void RamSearchOpLT(void) {
 #ifdef WIN32
-	extern void SetSearchType(int SearchType);
-	extern void DoRamSearchOperation();
-	SetSearchType(0);
-	DoRamSearchOperation();
+	if (GameInfo)
+	{
+		extern void SetSearchType(int SearchType);
+		extern void DoRamSearchOperation();
+		SetSearchType(0);
+		DoRamSearchOperation();
+	}
 #endif
 }
 
 static void RamSearchOpGT(void) {
 #ifdef WIN32
-	extern void SetSearchType(int SearchType);
-	extern void DoRamSearchOperation();
-	SetSearchType(1);
-	DoRamSearchOperation();
+	if (GameInfo)
+	{
+		extern void SetSearchType(int SearchType);
+		extern void DoRamSearchOperation();
+		SetSearchType(1);
+		DoRamSearchOperation();
+	}
 #endif
 }
 
 static void RamSearchOpLTE(void) {
 #ifdef WIN32
-	extern void SetSearchType(int SearchType);
-	extern void DoRamSearchOperation();
-	SetSearchType(2);
-	DoRamSearchOperation();
+	if (GameInfo)
+	{
+		extern void SetSearchType(int SearchType);
+		extern void DoRamSearchOperation();
+		SetSearchType(2);
+		DoRamSearchOperation();
+	}
 #endif
 }
 
 static void RamSearchOpGTE(void) {
 #ifdef WIN32
-	extern void SetSearchType(int SearchType);
-	extern void DoRamSearchOperation();
-	SetSearchType(3);
-	DoRamSearchOperation();
+	if (GameInfo)
+	{
+		extern void SetSearchType(int SearchType);
+		extern void DoRamSearchOperation();
+		SetSearchType(3);
+		DoRamSearchOperation();
+	}
 #endif
 }
 
 static void RamSearchOpEQ(void) {
 #ifdef WIN32
-	extern void SetSearchType(int SearchType);
-	extern void DoRamSearchOperation();
-	SetSearchType(4);
-	DoRamSearchOperation();
+	if (GameInfo)
+	{
+		extern void SetSearchType(int SearchType);
+		extern void DoRamSearchOperation();
+		SetSearchType(4);
+		DoRamSearchOperation();
+	}
 #endif
 }
 
 static void RamSearchOpNE(void) {
 #ifdef WIN32
-	extern void SetSearchType(int SearchType);
-	extern void DoRamSearchOperation();
-	SetSearchType(5);
-	DoRamSearchOperation();
+	if (GameInfo)
+	{
+		extern void SetSearchType(int SearchType);
+		extern void DoRamSearchOperation();
+		SetSearchType(5);
+		DoRamSearchOperation();
+	}
 #endif
 }