From d238791b7d909cf13efff905ed8e7872fe9dbeac Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Thu, 18 Jan 2018 18:07:49 +0100
Subject: [PATCH] RSX: properly handle disconnected pads

---
 rpcs3/Emu/RSX/overlays.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpcs3/Emu/RSX/overlays.h b/rpcs3/Emu/RSX/overlays.h
index 234ec613b4..8539186d0e 100644
--- a/rpcs3/Emu/RSX/overlays.h
+++ b/rpcs3/Emu/RSX/overlays.h
@@ -74,7 +74,7 @@ namespace rsx
 				}
 
 				const PadInfo& rinfo = handler->GetInfo();
-				if (rinfo.max_connect == 0 || !rinfo.now_connect)
+				if (rinfo.max_connect == 0)
 					return selection_code::error;
 
 				std::array<bool, 8> button_state;
@@ -85,7 +85,7 @@ namespace rsx
 					if (Emu.IsStopped())
 						return selection_code::canceled;
 
-					if (Emu.IsPaused())
+					if (Emu.IsPaused() || !rinfo.now_connect)
 					{
 						std::this_thread::sleep_for(10ms);
 						continue;