From 8ff221a8fa31f3137b589266c1ec14974a514586 Mon Sep 17 00:00:00 2001
From: p989 <p989@users.sf.net>
Date: Sat, 6 Jun 2009 15:08:13 +0000
Subject: [PATCH] moved ShowInputDisplay

---
 desmume/src/movie.cpp        | 1 +
 desmume/src/movie.h          | 1 +
 desmume/src/windows/main.cpp | 3 +--
 desmume/src/windows/main.h   | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp
index 72fce6e77..3ff1a8cc7 100644
--- a/desmume/src/movie.cpp
+++ b/desmume/src/movie.cpp
@@ -56,6 +56,7 @@ bool movie_readonly = true;
 char curMovieFilename[512] = {0};
 MovieData currMovieData;
 int currRerecordCount;
+bool ShowInputDisplay = false;
 
 //--------------
 
diff --git a/desmume/src/movie.h b/desmume/src/movie.h
index ac345cdf6..19b829166 100644
--- a/desmume/src/movie.h
+++ b/desmume/src/movie.h
@@ -194,5 +194,6 @@ void mov_savestate(std::ostream* os);
 bool mov_loadstate(std::istream* is, int size);
 void LoadFM2_binarychunk(MovieData& movieData, std::istream* fp, int size);
 extern bool movie_readonly;
+extern bool ShowInputDisplay;
 void FCEUI_MakeBackupMovie(bool dispMessage);
 #endif
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 050eee9b1..f2905b37b 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -258,7 +258,6 @@ int emu_paused = 0;
 bool frameAdvance = false;
 bool frameCounterDisplay = false;
 bool FpsDisplay = false;
-bool ShowInputDisplay = false;
 bool ShowLagFrameCounter = false;
 bool ShowMicrophone = false;
 bool HudEditorMode = false;
@@ -3843,7 +3842,7 @@ LRESULT CALLBACK MicrophoneSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
 				{
 					int val = 0;
 
-					if((!romloaded) || (val == IDYES))
+					if((romloaded)) //|| (val == IDYES))
 					{
 						HWND cur;
 
diff --git a/desmume/src/windows/main.h b/desmume/src/windows/main.h
index 99da12172..4396346fd 100644
--- a/desmume/src/windows/main.h
+++ b/desmume/src/windows/main.h
@@ -20,7 +20,6 @@ void WavEnd();
 
 extern bool frameCounterDisplay;
 extern bool FpsDisplay;
-extern bool ShowInputDisplay;
 extern bool ShowLagFrameCounter;
 
 #define GPU3D_NULL 0