diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-04 02:57:01 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-05 18:04:50 +0300 |
| commit | 536a5fccf9a8580510ad664c0b026ca8ca300494 (patch) | |
| tree | 8b8688d45a5e28aa991b658a00874ffa664c2e4e | |
| parent | c33e5a920dbed8a56bfbe10d395cbae7cc543747 (diff) | |
GlobalShortcut_win: fix access to nxboxinput in EnumDevicesCB.
EnumDevicesCB is a static method, so we must access 'nxboxinput'
via the GlobalShortcutWin pointer passed as user-data.
(cherry picked from commit ba1a18978ed7df3e01faaf5479f6eb5998181520)
| -rw-r--r-- | src/mumble/GlobalShortcut_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index cb6168dc3..c507dc7eb 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -467,7 +467,7 @@ 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)) { - nxboxinput += 1; + cbgsw->nxboxinput += 1; qWarning("GlobalShortcutWin: excluded XInput device '%s' (%s) from DirectInput", qPrintable(id->name), qPrintable(id->vguid.toString())); delete id; |