This commit is contained in:
Klaus Basan
2019-02-13 01:52:15 +01:00
committed by Mat Sutcliffe
parent dc84c9b334
commit 41b48a4420
4 changed files with 20 additions and 18 deletions

View File

@@ -47,8 +47,8 @@ namespace BlackGui
ui->setupUi(this);
ui->tv_Hotkeys->setModel(&m_model);
connect(ui->pb_AddHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::addEntry);
connect(ui->pb_EditHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::editEntry);
connect(ui->pb_AddHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::addEntry);
connect(ui->pb_EditHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::editEntry);
connect(ui->pb_RemoveHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::removeEntry);
connect(ui->tb_ReloadHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings);
@@ -176,6 +176,7 @@ namespace BlackGui
CIdentifierList CSettingsHotkeyComponent::getAllIdentifiers() const
{
CIdentifierList identifiers;
if (!sGui) { return identifiers; }
if (sGui->getIContextApplication()) { identifiers = sGui->getIContextApplication()->getRegisteredApplications(); }
// add local application