flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 16:56:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T254, avoid crashes when there is no input device

Browse Source 
* init with nullptr
* formatting
This commit is contained in:
Klaus Basan
2018-02-18 00:54:14 +01:00
parent be6b67f95d
commit 602373c97a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackinput/win/joystickwindows.cpp
View File

@@ -20,7 +20,6 @@ using namespace BlackMisc::Input;
namespace BlackInput
{
const TCHAR *CJoystickWindows::m_helperWindowClassName = TEXT("HelperWindow");
const TCHAR *CJoystickWindows::m_helperWindowName = TEXT("JoystickCatcherWindow");
ATOM CJoystickWindows::m_helperWindowClass = 0;
@@ -86,6 +85,12 @@ namespace BlackInput
HRESULT CJoystickWindows::enumJoystickDevices()
{
if (!m_directInput)
{
CLogMessage(this).warning("No direct input");
return E_FAIL;
}
HRESULT hr;
if (FAILED(hr = m_directInput->EnumDevices(DI8DEVTYPE_JOYSTICK, enumJoysticksCallback, this, DIEDFL_ATTACHEDONLY)))
{
@@ -145,7 +150,7 @@ namespace BlackInput
HRESULT hr = S_OK;
// Check if device list is empty first
if (m_availableJoystickDevices.isEmpty()) return E_FAIL;
if (m_availableJoystickDevices.isEmpty()) { return E_FAIL; }
// FIXME: Take the first device with number of buttons > 0
// For the future, the user should be able to choose which device