Gurkengewuerz/KShare
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix empty hotkeys being loaded

Browse Source
This commit is contained in:
ArsenArsen 2017-07-05 15:30:50 +02:00
parent 7d5be857ff
commit 159720d9fa
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotkeying.cpp
View File

@ -28,10 +28,14 @@ void hotkeying::load(QString seqName, std::function<void()> func, QString def) {
QString name = seqName; QString name = seqName;
name.prepend("hotkey_"); name.prepend("hotkey_");
if (hotkeys.contains(seqName)) return; if (hotkeys.contains(seqName)) return;
if (settings::settings().contains(name)) if (settings::settings().contains(name)) {
h = new QHotkey(QKeySequence(settings::settings().value(name).toString()), true); QString k = settings::settings().value(name).toString();
if (!k.isEmpty())
h = new QHotkey(QKeySequence(settings::settings().value(k).toString()), true);
else else
h = new QHotkey(def.isNull() ? "" : def, true); h = new QHotkey(def.isNull() ? "" : def, true);
} else
h = new QHotkey(def.isNull() ? "" : def, true);
QObject::connect(h, &QHotkey::activated, func); QObject::connect(h, &QHotkey::activated, func);
hotkeys.insert(seqName, h); hotkeys.insert(seqName, h);
if (!h->isRegistered() && (settings::settings().contains(name) || !def.isEmpty())) if (!h->isRegistered() && (settings::settings().contains(name) || !def.isEmpty()))