mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

GlobalShortcutWin: fix build without XboxInput

Browse Source 
The code accessed a variable ("nxboxinput") even when not existent, resulting in compiler errors.

This commit fixes the issue by adding the missing checks.
This commit is contained in:
Davide Beatrici 2019-11-01 09:31:36 +01:00
parent 8cdc8f4bd9
commit cf50fffae7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mumble/GlobalShortcut_win.cpp
View File

@ -487,8 +487,9 @@ BOOL GlobalShortcutWin::EnumDevicesCB(LPCDIDEVICEINSTANCE pdidi, LPVOID pContext
// See issues mumble-voip/mumble#2104 and mumble-voip/mumble#2147
// for more information.
if (XInputCheck_IsGuidProductXInputDevice(&id->guidproduct)) {
#ifdef USE_XBOXINPUT
cbgsw->nxboxinput += 1;
#endif
qWarning("GlobalShortcutWin: excluded XInput device '%s' (guid %s guid product %s) from DirectInput",
qPrintable(id->name),
qPrintable(id->vguid.toString()),
@ -620,8 +621,9 @@ void GlobalShortcutWin::timeTicked() {
uiHardwareDevices = g.mw->uiNewHardware;
XInputCheck_ClearDeviceCache();
#ifdef USE_XBOXINPUT
nxboxinput = 0;
#endif
pDI->EnumDevices(DI8DEVCLASS_ALL, EnumDevicesCB, static_cast<void *>(this), DIEDFL_ATTACHEDONLY);
}