From 21efe5825455203362643d5274e55eb12cdbacdc Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sat, 4 Jan 2014 22:41:23 -0800
Subject: [PATCH] Fix XInput query.

---
 src/xenia/kernel/xam_input.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/xenia/kernel/xam_input.cc b/src/xenia/kernel/xam_input.cc
index 7324d85ff..52a7f2b77 100644
--- a/src/xenia/kernel/xam_input.cc
+++ b/src/xenia/kernel/xam_input.cc
@@ -66,17 +66,16 @@ SHIM_CALL XamInputGetState_shim(
       user_index,
       state_ptr);
 
-  if (!state_ptr) {
-    SHIM_SET_RETURN(X_ERROR_BAD_ARGUMENTS);
-    return;
-  }
+  // Games call this with a NULL state ptr, probably as a query.
 
   InputSystem* input_system = state->emulator()->input_system();
 
   X_INPUT_STATE input_state;
   X_RESULT result = input_system->GetState(user_index, input_state);
   if (XSUCCEEDED(result)) {
-    input_state.Write(SHIM_MEM_BASE, state_ptr);
+    if (state_ptr) {
+      input_state.Write(SHIM_MEM_BASE, state_ptr);
+    }
   }
   SHIM_SET_RETURN(result);
 }