feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: If651b6a5fddcdec5ce62a195448a30152a01fca6
This commit is contained in:
Eike Ziller
2016-09-27 12:11:03 +02:00
parent 2689383fd3 91b3042cbe
commit 75abb5e7c3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/macros/macromanager.cpp
View File

@@ -179,6 +179,8 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
// Remove macro from the map // Remove macro from the map
Macro *macro = macros.take(name); Macro *macro = macros.take(name);
if (macro == currentMacro)
currentMacro = 0;
delete macro; delete macro;
} }