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

Reaper: do not disconnect process before reaping

Browse Source 
AbstractProcessStep is relying on signals which breaks with
the disconnect call.

Amends ebae255e49

Fixes: QTCREATORBUG-26271
Change-Id: I16ebaad68352be5c41492e5c4d4fbc3f032e2e39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2021-09-17 11:39:33 +02:00
parent 8755b2336f
commit 67b8e8f9b1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -57,8 +57,10 @@ CMakeProcess::CMakeProcess()
CMakeProcess::~CMakeProcess() CMakeProcess::~CMakeProcess()
{ {
if (m_process) if (m_process) {
m_process->disconnect();
Core::Reaper::reap(m_process.release()); Core::Reaper::reap(m_process.release());
}
m_parser.flush(); m_parser.flush();

1
src/plugins/coreplugin/reaper.cpp
View File

@@ -159,7 +159,6 @@ void reap(QtcProcess *process, int timeoutMs)
process->setStdOutCallback(nullptr); process->setStdOutCallback(nullptr);
process->setStdErrCallback(nullptr); process->setStdErrCallback(nullptr);
process->disconnect();
QTC_ASSERT(Internal::d, return); QTC_ASSERT(Internal::d, return);