summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBe <be@mixxx.org>2020-07-27 12:43:42 -0500
committerBe <be@mixxx.org>2020-07-27 12:43:42 -0500
commit45ca90cc2abd148deb0fd11c0df2a17d22d4e8a2 (patch)
tree48914761c6b4b5e8a040136d75ad5835e091c975 /res
parent3225d7b67c4a743962c03cf3704bc35d993dc832 (diff)
parent33bcef1e44890f4efc25fff80ef12c407eb02ecc (diff)
Merge remote-tracking branch 'upstream/2.2' into 2.3
Diffstat (limited to 'res')
-rw-r--r--res/controllers/common-hid-packet-parser.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/controllers/common-hid-packet-parser.js b/res/controllers/common-hid-packet-parser.js
index e887575473..a7f6becd3a 100644
--- a/res/controllers/common-hid-packet-parser.js
+++ b/res/controllers/common-hid-packet-parser.js
@@ -632,7 +632,7 @@ HIDPacket.prototype.parse = function(data) {
field.delta = value - field.value
}
if (field.mindelta == undefined || change > field.mindelta) {
- field_changes[field.name] = field
+ field_changes[field.id] = field
field.value = value
}
}