Merge branch '2.0'

This commit is contained in:
Felix Geyer
2015-09-21 23:23:51 +02:00
10 changed files with 63 additions and 12 deletions

View File

@@ -218,6 +218,8 @@ void AutoType::performAutoTypeFromGlobal(Entry* entry, const QString& sequence)
{
Q_ASSERT(m_inAutoType);
m_plugin->raiseWindow(m_windowFromGlobal);
m_inAutoType = false;
performAutoType(entry, nullptr, sequence, m_windowFromGlobal);
}