From 0ac83f99dc1450a05e2e31d4a474345684c597cd Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Sat, 3 Aug 2019 20:47:39 -0500
Subject: [PATCH] [App] Add winkey input driver last.

---
 src/xenia/app/xenia_main.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index d92d96a35..2ecf3a1b2 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -167,8 +167,9 @@ std::vector<std::unique_ptr<hid::InputDriver>> CreateInputDrivers(
   } else {
     Factory<hid::InputDriver, ui::Window*> factory;
 #if XE_PLATFORM_WIN32
-    factory.Add("winkey", xe::hid::winkey::Create);
     factory.Add("xinput", xe::hid::xinput::Create);
+    // WinKey input driver should always be the last input driver added!
+    factory.Add("winkey", xe::hid::winkey::Create);
 #endif  // XE_PLATFORM_WIN32
     for (auto& driver : factory.CreateAll(cvars::hid, window)) {
       if (XSUCCEEDED(driver->Setup())) {