diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 12:39:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-04-24 13:58:05 +0200 |
| commit | d79febdde966f8becfbf2c0a4fdd4cd4ed4f2c25 (patch) | |
| tree | 0fa42e55e8aa480982d8f1d9561cbfffd3501c7d /src/plugins/clangtools | |
| parent | 02785342acc1580210e6d69b5893c431ddc0c009 (diff) | |
| parent | 20b095c6b4b9bd394a4ad6062a588de5bbf14b52 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
Change-Id: I90ef0063ed24e23bcb3d73fff086f50324faa1e2
Diffstat (limited to 'src/plugins/clangtools')
| -rw-r--r-- | src/plugins/clangtools/clangtool.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index ba7747d9a0..fc621b2e78 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -698,6 +698,7 @@ void ClangTool::startTool(ClangTool::FileSelection fileSelection, connect(m_runWorker, &ClangToolRunWorker::started, this, &ClangTool::onStarted); connect(m_runWorker, &ClangToolRunWorker::runnerFinished, this, &ClangTool::updateForCurrentState); + connect(m_runControl, &RunControl::destroyed, [this](){ m_runWorker = nullptr; }); // More init and UI update m_diagnosticFilterModel->setProject(project); @@ -1038,6 +1039,8 @@ void ClangTool::onRunControlStopped() void ClangTool::update() { updateForInitialState(); + if (!m_runWorker) + return; updateForCurrentState(); } |