diff --git a/src/xenia/kernel/xam/xam_input.cc b/src/xenia/kernel/xam/xam_input.cc index c890b30da..869a24c58 100644 --- a/src/xenia/kernel/xam/xam_input.cc +++ b/src/xenia/kernel/xam/xam_input.cc @@ -204,11 +204,15 @@ dword_result_t XamInputGetKeystrokeEx_entry( static std::atomic swallowed{0}; const uint32_t n = swallowed.fetch_add(1, std::memory_order_relaxed); if ((n % 600) == 0) { + // Upstream replaced the two counters this used to print + // (xam_dialogs_shown_ / xam_nui_dialogs_shown_) with a single + // is_xam_dialog_present_ flag, reachable only through IsUIActive(). The + // counts are gone, so report the state that remains — which is the thing + // the message is actually about. XELOGW( "[RE-INPUT] XamInputGetKeystrokeEx swallowed by IsUIActive " - "(dialogs={} nui={}, {} so far)", - kernel_state()->xam_state()->xam_dialogs_shown_.load(), - kernel_state()->xam_state()->xam_nui_dialogs_shown_.load(), n + 1); + "(ui_active={}, {} so far)", + kernel_state()->xam_state()->IsUIActive(), n + 1); } return X_ERROR_SUCCESS; }