Merge branch 'release/2.2.1' into develop

2017-07-01 10:09:06 +02:00
parent 13c678344e 2d127b8942
commit 6e44eed9fe
10 changed files with 209 additions and 193 deletions
--- a/src/autotype/AutoType.cpp
+++ b/src/autotype/AutoType.cpp
@@ -317,7 +317,7 @@ bool AutoType::parseActions(const QString& sequence, const Entry* entry, QList<A
 {
    QString tmpl;
    bool inTmpl = false;
-    m_autoTypeDelay = 0;
+    m_autoTypeDelay = config()->get("AutoTypeDelay").toInt();


    for (const QChar& ch : sequence) {