Commit 75abb5e7 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.0' into 4.1

Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
parents 2689383f 91b3042c
......@@ -179,6 +179,8 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
// Remove macro from the map
Macro *macro = macros.take(name);
if (macro == currentMacro)
currentMacro = 0;
delete macro;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment