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

Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
2016-09-27 12:11:03 +02:00
parent 2689383fd3 91b3042cbe
commit 75abb5e7c3
1 changed files with 2 additions and 0 deletions
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -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;
 }