Merge branch 'master' into d3d12

2018-08-25 23:26:32 +03:00
parent dba8ab4eed de43afbb54
commit 110d4724f9
2 changed files with 11 additions and 5 deletions
--- a/src/xenia/hid/xinput/xinput_input_driver.cc
+++ b/src/xenia/hid/xinput/xinput_input_driver.cc
@@ -26,10 +26,18 @@ namespace xinput {

 XInputInputDriver::XInputInputDriver(xe::ui::Window* window)
    : InputDriver(window) {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8 && _WIN32_WINNT < _WIN32_WINNT_WIN10)
+  // TODO(gibbed): Is this necessary?
  XInputEnable(TRUE);
+#endif
 }

-XInputInputDriver::~XInputInputDriver() { XInputEnable(FALSE); }
+XInputInputDriver::~XInputInputDriver() {
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8 && _WIN32_WINNT < _WIN32_WINNT_WIN10)
+  // TODO(gibbed): Is this necessary?
+  XInputEnable(FALSE);
+#endif
+}

 #pragma warning(pop)