Merge pull request #5577 from ligfx/separateexpressionparsingandbinding

ControlReference/ExpressionParser: separate parsing from binding
This commit is contained in:
Leo Lam
2017-09-15 19:11:57 +02:00
committed by GitHub
9 changed files with 200 additions and 202 deletions

View File

@ -344,7 +344,7 @@ void HotkeyManager::LoadDefaults(const ControllerInterface& ciface)
auto set_key_expression = [this](int index, const std::string& expression) {
m_keys[FindGroupByID(index)]
->controls[GetIndexForGroup(FindGroupByID(index), index)]
->control_ref->expression = expression;
->control_ref->SetExpression(expression);
};
// General hotkeys