From ed3393987f4d9b6fd024b4e9bf38353500ea01eb Mon Sep 17 00:00:00 2001 From: p989 Date: Sat, 11 Apr 2009 01:08:03 +0000 Subject: [PATCH] win32: fixed an input display related merging mistake --- desmume/src/windows/inputdx.cpp | 2 -- desmume/src/windows/main.cpp | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/desmume/src/windows/inputdx.cpp b/desmume/src/windows/inputdx.cpp index 1657fd9d3..52c8a0de8 100644 --- a/desmume/src/windows/inputdx.cpp +++ b/desmume/src/windows/inputdx.cpp @@ -2211,8 +2211,6 @@ void input_process() NDS_setPad( R, L, D, U, T, S, B, A, Y, X, W, E, G, F); - if (ShowInputDisplay) osd->addFixed(0, 45, "%s",InputDisplayString.c_str()); - } static void set_hotkeyinfo(HWND hDlg) diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 52fc970a8..8b698e500 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -996,6 +996,8 @@ DWORD WINAPI run() while(execute) { input_process(); + + if (ShowInputDisplay) osd->addFixed(Hud.InputDisplay.x, Hud.InputDisplay.y, "%s",InputDisplayString.c_str()); { Lock lock; @@ -1128,7 +1130,6 @@ DWORD WINAPI run() } frameCounter++; if (frameCounterDisplay) osd->addFixed(Hud.FrameCounter.x, Hud.FrameCounter.y, "%d",frameCounter); - if (ShowInputDisplay) osd->addFixed(Hud.InputDisplay.x, Hud.InputDisplay.y, "%s",InputDisplayString.c_str()); if (ShowLagFrameCounter) osd->addFixed(Hud.LagFrameCounter.x, Hud.LagFrameCounter.y, "%d",TotalLagFrames); if (ShowMicrophone) osd->addFixed(Hud.Microphone.x, Hud.Microphone.y, "%d",MicDisplay); DisplayMessage();