fixing merge bug

This commit is contained in:
Wayne Chen 2018-12-12 18:41:28 -08:00 committed by GitHub
parent 4116f6ca9a
commit 34130778ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -450,6 +450,8 @@ void Keyboard::setResetKeyboardPositionOnRaise(bool reset) {
_resetKeyboardPositionOnRaise = reset;
});
}
}
void Keyboard::setPreferMalletsOverLasers(bool preferMalletsOverLasers) {
_preferMalletsOverLasersSettingLock.withWriteLock([&] {
_preferMalletsOverLasers.set(preferMalletsOverLasers);