From 159720d9faf21bd4ca4535ffca61c79c0fef0a6c Mon Sep 17 00:00:00 2001
From: ArsenArsen <ArsenArsen@users.noreply.github.com>
Date: Wed, 5 Jul 2017 15:30:50 +0200
Subject: [PATCH] Fix empty hotkeys being loaded

---
 hotkeying.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/hotkeying.cpp b/hotkeying.cpp
index 17288ca..2dd5971 100644
--- a/hotkeying.cpp
+++ b/hotkeying.cpp
@@ -28,9 +28,13 @@ void hotkeying::load(QString seqName, std::function<void()> func, QString def) {
     QString name = seqName;
     name.prepend("hotkey_");
     if (hotkeys.contains(seqName)) return;
-    if (settings::settings().contains(name))
-        h = new QHotkey(QKeySequence(settings::settings().value(name).toString()), true);
-    else
+    if (settings::settings().contains(name)) {
+        QString k = settings::settings().value(name).toString();
+        if (!k.isEmpty())
+            h = new QHotkey(QKeySequence(settings::settings().value(k).toString()), true);
+        else
+            h = new QHotkey(def.isNull() ? "" : def, true);
+    } else
         h = new QHotkey(def.isNull() ? "" : def, true);
     QObject::connect(h, &QHotkey::activated, func);
     hotkeys.insert(seqName, h);