Index: Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboardMouse.cpp =================================================================== --- Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboardMouse.cpp (revision 5568) +++ Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboardMouse.cpp (working copy) @@ -52,33 +52,26 @@ LPDIRECTINPUTDEVICE8 mo_device; if ( DI_OK == idi8->CreateDevice( GUID_SysKeyboard, &kb_device, NULL ) ) - if ( DI_OK == kb_device->SetDataFormat( &c_dfDIKeyboard ) ) - if ( DI_OK == kb_device->SetCooperativeLevel( NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE) ) - if ( DI_OK == kb_device->Acquire() ) { - - if ( DI_OK == idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL ) ) - if ( DI_OK == mo_device->SetDataFormat( &c_dfDIMouse2 ) ) - if ( DI_OK == mo_device->SetCooperativeLevel( NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE) ) - if ( DI_OK == mo_device->Acquire() ) + if (( DI_OK == kb_device->SetDataFormat( &c_dfDIKeyboard )) && + ( DI_OK == kb_device->SetCooperativeLevel( NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE) ) && + ( DI_OK == kb_device->Acquire() ) ) { - devices.push_back( new KeyboardMouse( kb_device, mo_device ) ); - return; + if ( DI_OK == idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL ) ) { + if (( DI_OK == mo_device->SetDataFormat( &c_dfDIMouse2 ) ) && + ( DI_OK == mo_device->SetCooperativeLevel( NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE) ) && + ( DI_OK == mo_device->Acquire() ) ) + { + devices.push_back( new KeyboardMouse( kb_device, mo_device ) ); + return; + } + } + mo_device->Release(); + } + kb_device->Unacquire(); } - else - goto release_mouse; - - goto unacquire_kb; + kb_device->Release(); } - else - goto release_kb; - -release_mouse: - mo_device->Release(); -unacquire_kb: - kb_device->Unacquire(); -release_kb: - kb_device->Release(); } KeyboardMouse::~KeyboardMouse()