From db725155c1f3a51de4bab0a2ccc7cb86c5c6a314 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 10 Jan 2017 19:55:31 +0100 Subject: [PATCH] (D3D) Another buildfix --- gfx/drivers_context/d3d_ctx.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gfx/drivers_context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp index d6f3e99901..d9b307de9f 100644 --- a/gfx/drivers_context/d3d_ctx.cpp +++ b/gfx/drivers_context/d3d_ctx.cpp @@ -29,6 +29,7 @@ #include "../drivers/d3d.h" #include "../common/win32_common.h" +#include "../../configuration.h" #include "../../runloop.h" #include "../../verbosity.h" #include "../../ui/ui_companion_driver.h" @@ -183,14 +184,15 @@ static void gfx_ctx_d3d_destroy(void *data) static void gfx_ctx_d3d_input_driver(void *data, const input_driver_t **input, void **input_data) { + settings_t *settings = config_get_ptr(); #ifdef _XBOX - void *xinput = input_xinput.init(); - *input = xinput ? (const input_driver_t*)&input_xinput : NULL; - *input_data = xinput; + void *xinput = input_xinput.init(settings->input.joypad_driver); + *input = xinput ? (const input_driver_t*)&input_xinput : NULL; + *input_data = xinput; #else - dinput = input_dinput.init(); - *input = dinput ? &input_dinput : NULL; - *input_data = dinput; + dinput = input_dinput.init(settings->input.joypad_driver); + *input = dinput ? &input_dinput : NULL; + *input_data = dinput; #endif (void)data; }