Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 18:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing merge bug

Browse source
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
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/Keyboard.cpp
View file

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