HW/WiimoteReal: Drop stale data reports to prevent read queue from filling up and causing input delays.

1 files changed, 9 insertions, 4 deletions

diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index c47700d13c..005be23c76 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -411,11 +411,16 @@ bool Wiimote::GetNextReport(Report* report)
 // Returns the next report that should be sent
 Report& Wiimote::ProcessReadQueue(bool repeat_last_data_report)
 {
-  if (!GetNextReport(&m_last_input_report) &&
-      !(IsDataReport(m_last_input_report) && repeat_last_data_report))
-  {
-    // If we didn't get a new report and it's not a data report to repeat, it's irrelevant.
+  // If we're not repeating data reports or had a non-data report, any old report is irrelevant.
+  if (!repeat_last_data_report || !IsDataReport(m_last_input_report))
     m_last_input_report.clear();
+
+  // Step through the read queue.
+  while (GetNextReport(&m_last_input_report))
+  {
+    // Stop on a non-data report.
+    if (!IsDataReport(m_last_input_report))
+      break;
   }
 
   return m_last_input_report;