Fix hotkey settings not loaded during app start

CInputManager is listening for hotkey settings changes, but it never loaded
the current state during construction and kept an empty setting.

ref T318
This commit is contained in:
Roland Winklmeier
2018-08-31 14:58:50 +02:00
committed by Klaus Basan
parent be14be1e7c
commit 2856dad280
2 changed files with 5 additions and 4 deletions

View File

@@ -31,6 +31,7 @@ namespace BlackCore
{
connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::ps_processKeyCombinationChanged, Qt::QueuedConnection);
connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::ps_processButtonCombinationChanged, Qt::QueuedConnection);
reloadHotkeySettings();
}
CInputManager *CInputManager::instance()
@@ -69,7 +70,7 @@ namespace BlackCore
}
}
void CInputManager::onChangedHotkeySettings()
void CInputManager::reloadHotkeySettings()
{
m_configuredActions.clear();
for (const CActionHotkey &actionHotkey : m_actionHotkeys.getThreadLocal())