diff options
| author | David Schulz <david.schulz@qt.io> | 2016-09-26 08:16:48 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2016-09-26 12:54:57 +0000 |
| commit | 91b3042cbe367d8311cf090a9a5b345ba8eeefa5 (patch) | |
| tree | b3ac9a522bb778eb14a045d5563cbbffa296b968 | |
| parent | e84abe3af1335c000b8f581c351b5e387101ea8f (diff) | |
| download | qt-creator-91b3042cbe367d8311cf090a9a5b345ba8eeefa5.tar.gz | |
Macros: Check and reset currentMacro pointer after deletion4.0
Task-number: QTCREATORBUG-16933
Change-Id: Ib55d5dd4b0478b655d6cb31f28c8ceb38159912f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -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 9a15ebe312..11097ce2a0 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -183,6 +183,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; } |