summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2016-06-24 16:28:27 +0200
committerLéo Lam <leo@innovatetechnologi.es>2016-06-25 13:46:53 +0200
commit9b075556ea826699800d9478d1eed3a80368c348 (patch)
tree86b9b663be04b205bc6b1a501125cba042e7bd9a /Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
parentd3e2ae35ff853d115aca077eaa10b88114ef7c7c (diff)
Fix a small formatting issue
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp27
1 files changed, 8 insertions, 19 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index 3d9b692ba0..fc02238980 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -44,26 +44,15 @@ void InitKeyboardMouse(IDirectInput8* const idi8, HWND _hwnd)
LPDIRECTINPUTDEVICE8 kb_device = nullptr;
LPDIRECTINPUTDEVICE8 mo_device = nullptr;
- if (SUCCEEDED(idi8->CreateDevice(GUID_SysKeyboard, &kb_device, nullptr)))
+ if (SUCCEEDED(idi8->CreateDevice(GUID_SysKeyboard, &kb_device, nullptr)) &&
+ SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)) &&
+ SUCCEEDED(kb_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)) &&
+ SUCCEEDED(idi8->CreateDevice(GUID_SysMouse, &mo_device, nullptr)) &&
+ SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)) &&
+ SUCCEEDED(mo_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
{
- if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
- {
- if (SUCCEEDED(kb_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
- {
- if (SUCCEEDED(idi8->CreateDevice(GUID_SysMouse, &mo_device, nullptr)))
- {
- if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
- {
- if (SUCCEEDED(
- mo_device->SetCooperativeLevel(nullptr, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
- {
- g_controller_interface.AddDevice(new KeyboardMouse(kb_device, mo_device));
- return;
- }
- }
- }
- }
- }
+ g_controller_interface.AddDevice(new KeyboardMouse(kb_device, mo_device));
+ return;
}
if (kb_device)