From 91b3042cbe367d8311cf090a9a5b345ba8eeefa5 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Mon, 26 Sep 2016 08:16:48 +0200
Subject: Macros: Check and reset currentMacro pointer after deletion

Task-number: QTCREATORBUG-16933
Change-Id: Ib55d5dd4b0478b655d6cb31f28c8ceb38159912f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/macros/macromanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

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;
 }
 
-- 
cgit v1.2.3