Input: use interception_count to handle multiple concurrent modals

RPCS3 · Jun 1, 2019 · f007128 · f007128
1 parent f501dc6
commit f007128
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/rpcs3/pad_thread.cpp b/rpcs3/pad_thread.cpp
@@ -159,11 +159,17 @@ void pad_thread::SetIntercepted(bool intercepted)
 {
 	if (intercepted)
 	{
+		++interception_count;
 		m_info.system_info |= CELL_PAD_INFO_INTERCEPTED;
 	}
 	else
 	{
-		m_info.system_info &= ~CELL_PAD_INFO_INTERCEPTED;
+		interception_count.try_dec(0);
+
+		if (interception_count == 0)
+		{
+			m_info.system_info &= ~CELL_PAD_INFO_INTERCEPTED;
+		}
 	}
 }
 

diff --git a/rpcs3/pad_thread.h b/rpcs3/pad_thread.h
@@ -43,6 +43,7 @@ class pad_thread
 	atomic_t<bool> active{ false };
 	atomic_t<bool> reset{ false };
 	atomic_t<bool> is_enabled{ true };
+	atomic_t<u32> interception_count{ 0 };
 	std::shared_ptr<std::thread> thread;
 };