Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	UI/ControlMappingScreen.cpp
This commit is contained in:
LunaMoo committed 2019-09-03 03:40:02 +02:00
commit 23b51deb26
18 files changed
+171 -104

No files matched your search

+3 -2
View File
@@ -258,7 +258,7 @@ namespace MainWindow
}
}
void RelaseMouseWheel() {
void ReleaseMouseWheel() {
// For simplicity release both wheel events
KeyInput key;
key.deviceId = DEVICE_ID_MOUSE;
@@ -856,7 +856,8 @@ namespace MainWindow
return 0;
// Hack: need to release wheel event with a delay for games to register it was "pressed down".
case TIMER_WHEELRELEASE:
RelaseMouseWheel();
ReleaseMouseWheel();
KillTimer(hWnd, TIMER_WHEELRELEASE);
return 0;
}
break;