Debugger: Do not create the console unnecessarily

Triggering console creation in the plugin destructor is not needed.

Change-Id: Ic21016e7a19fa08ea7dd03a8364aa6fc229bb2d1
Reviewed-by: David Schulz <[email protected]>

2 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp
index 0f2cb819fc7..74800498fbb 100644
--- a/src/plugins/debugger/console/console.cpp
+++ b/src/plugins/debugger/console/console.cpp
@@ -283,11 +283,20 @@ void Console::evaluate(const QString &expression)
     }
 }
 
+static Console *theConsole = nullptr;
+
 Console *debuggerConsole()
 {
-    static Console *theConsole = new Console;
+    if (!theConsole)
+        theConsole = new Console;
     return theConsole;
 }
 
+void destroyDebuggerConsole()
+{
+    delete theConsole;
+    theConsole = nullptr;
+}
+
 } // Internal
 } // Debugger
diff --git a/src/plugins/debugger/console/console.h b/src/plugins/debugger/console/console.h
index 962df2691f5..e68c5554714 100644
--- a/src/plugins/debugger/console/console.h
+++ b/src/plugins/debugger/console/console.h
@@ -99,6 +99,7 @@ private:
 };
 
 Console *debuggerConsole();
+void destroyDebuggerConsole();
 
 } // namespace Internal
 } // namespace Debugger