2 files changed, 5 insertions, 6 deletions

diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 9065c8ca..851625d2 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -344,15 +344,14 @@ void AltDodoCheat(void)
 #endif
 
 bool
-CControllerState::IsAnyButtonPressed(void)
+CControllerState::CheckForInput(void)
 {
 	return !!RightStickX || !!RightStickY || !!LeftStickX || !!LeftStickY
 		|| !!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight
 		|| !!Triangle || !!Cross || !!Circle || !!Square
 		|| !!Start || !!Select
 		|| !!LeftShoulder1 || !!LeftShoulder2 || !!RightShoulder1 || !!RightShoulder2
-		|| !!LeftShock || !!RightShock
-		|| !!NetworkTalk;
+		|| !!LeftShock || !!RightShock;
 }
 
 void
@@ -1074,7 +1073,7 @@ void CPad::UpdatePads(void)
 	CapturePad(0);
 #endif
 #ifdef DETECT_PAD_INPUT_SWITCH
-	if (GetPad(0)->PCTempJoyState.IsAnyButtonPressed())
+	if (GetPad(0)->PCTempJoyState.CheckForInput())
 		IsAffectedByController = true;
 	else {
 #endif
@@ -1084,7 +1083,7 @@ void CPad::UpdatePads(void)
 
 #ifdef DETECT_PAD_INPUT_SWITCH
 	}
-	if (IsAffectedByController && (GetPad(0)->PCTempKeyState.IsAnyButtonPressed() || GetPad(0)->PCTempMouseState.IsAnyButtonPressed()))
+	if (IsAffectedByController && (GetPad(0)->PCTempKeyState.CheckForInput() || GetPad(0)->PCTempMouseState.CheckForInput()))
 		IsAffectedByController = false;
 #endif
 
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 6f20571f..8c3bc752 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -29,7 +29,7 @@ public:
 	float GetRightStickX(void) { return RightStickX/32767.0f; };
 	float GetRightStickY(void) { return RightStickY/32767.0f; };
 
-	bool IsAnyButtonPressed();
+	bool CheckForInput();
 	void Clear(void);
 };
 VALIDATE_SIZE(CControllerState, 0x2A);