diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-09-27 12:11:03 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-09-27 12:11:11 +0200 |
| commit | 75abb5e7c333ad4d5f1c4cc1dba5a5b2518697b9 (patch) | |
| tree | 874f6516731a7a2836b8ee27a348bdcd7e2371f5 /src/plugins/macros | |
| parent | 2689383fd3e1026eeaf5fcddfad69e97c136cc7d (diff) | |
| parent | 91b3042cbe367d8311cf090a9a5b345ba8eeefa5 (diff) | |
Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
Diffstat (limited to 'src/plugins/macros')
| -rw-r--r-- | src/plugins/macros/macromanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index ac2f23f3c27..109a7248c71 100644 --- 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; } |