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

QtcProcess: Disconnect from ProcessInterface signals

Browse Source 
... on destruction.

Change-Id: I6751e1ba2999f506e85ebb697a8a1c7152ea9abb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-10-17 14:57:19 +02:00
parent 5c7c3a410d
commit d85dd1962b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/qtcprocess.cpp
View File

@@ -634,6 +634,8 @@ public:
void setProcessInterface(ProcessInterface *process) void setProcessInterface(ProcessInterface *process)
{ {
if (m_process)
m_process->disconnect();
m_process.reset(process); m_process.reset(process);
m_process->setParent(this); m_process->setParent(this);
connect(m_process.get(), &ProcessInterface::started, connect(m_process.get(), &ProcessInterface::started,
@@ -805,6 +807,14 @@ GeneralProcessBlockingImpl::GeneralProcessBlockingImpl(QtcProcessPrivate *parent
// In order to move the process interface into another thread together with handle // In order to move the process interface into another thread together with handle
parent->m_process.get()->setParent(m_processHandler.get()); parent->m_process.get()->setParent(m_processHandler.get());
m_processHandler->setParent(this); m_processHandler->setParent(this);
// So the hierarchy looks like:
// QtcProcessPrivate
// |
// +- GeneralProcessBlockingImpl
// |
// +- ProcessInterfaceHandler
// |
// +- ProcessInterface
} }
bool GeneralProcessBlockingImpl::waitForSignal(ProcessSignalType newSignal, int msecs) bool GeneralProcessBlockingImpl::waitForSignal(ProcessSignalType newSignal, int msecs)
@@ -995,6 +1005,8 @@ QtcProcess::~QtcProcess()
{ {
QTC_ASSERT(!d->m_guard.isLocked(), qWarning("Deleting QtcProcess instance directly from " QTC_ASSERT(!d->m_guard.isLocked(), qWarning("Deleting QtcProcess instance directly from "
"one of its signal handlers will lead to crash!")); "one of its signal handlers will lead to crash!"));
if (d->m_process)
d->m_process->disconnect();
delete d; delete d;
} }