From 2eb1565aaac9b8196fd0361c9394e8cd12afade2 Mon Sep 17 00:00:00 2001
From: "baby.lueshi" <baby.lueshi@gmail.com>
Date: Wed, 13 Jul 2011 05:53:56 +0000
Subject: [PATCH] Fixed hotkeys not working with the TAS Input dialog open.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7676 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/Frame.cpp       | 2 +-
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 5 +++++
 Source/Core/DolphinWX/Src/TASInputDlg.h   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 4d29350744..87eef2fa7c 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -864,7 +864,7 @@ void TASManipFunction(SPADStatus *PadStatus, int controllerID)
 void CFrame::OnKeyDown(wxKeyEvent& event)
 {
 	if(Core::GetState() != Core::CORE_UNINITIALIZED &&
-			RendererHasFocus())
+			(RendererHasFocus() || g_TASInputDlg->HasFocus()))
 	{
 		int WiimoteId = -1;
 		// Toggle fullscreen
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 0da301176f..689681d199 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -368,3 +368,8 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
 		ResetValues();
 	}
 }
+
+bool TASInputDlg::HasFocus()
+{
+	return (wxWindow::FindFocus() == this || wxWindow::FindFocus()->GetParent() == this);
+}
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h
index 1115a2bc8a..b65f4c9bf5 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.h
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.h
@@ -39,6 +39,7 @@ class TASInputDlg : public wxDialog
 		void UpdateFromText(wxCommandEvent& event);
 		void ResetValues();
 		void GetValues(SPADStatus *PadStatus, int controllerID);
+		bool HasFocus();
 
 	private:
 		u8 mainX, mainY, cX, cY, lTrig, rTrig;