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

QtcProcess: Ensure we set the data just after creating handle

Browse Source 
...instead of ensuring in many functions that m_setup isn't null.
This amends 36c49cd2ea and
solves the issue for other functions like processId(),
exitCode(), etc...

Amends 36c49cd2ea

Change-Id: I986f7b30e90e5825ae2bb57b4bc2aa14f56e401f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-03-02 18:35:27 +01:00
parent acd7445c6e
commit ac3aa805b9
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/launchersocket.cpp
View File

@@ -337,14 +337,12 @@ int CallerHandle::exitCode() const
QString CallerHandle::errorString() const QString CallerHandle::errorString() const
{ {
QTC_ASSERT(isCalledFromCallersThread(), return {}); QTC_ASSERT(isCalledFromCallersThread(), return {});
QTC_ASSERT(m_setup.get(), return {});
return m_setup->m_errorString; return m_setup->m_errorString;
} }
void CallerHandle::setErrorString(const QString &str) void CallerHandle::setErrorString(const QString &str)
{ {
QTC_ASSERT(isCalledFromCallersThread(), return); QTC_ASSERT(isCalledFromCallersThread(), return);
QTC_ASSERT(m_setup.get(), return);
m_setup->m_errorString = str; m_setup->m_errorString = str;
} }

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

@@ -485,6 +485,7 @@ public:
ProcessLauncherImpl() : m_token(uniqueToken()) ProcessLauncherImpl() : m_token(uniqueToken())
{ {
m_handle = LauncherInterface::registerHandle(this, token()); m_handle = LauncherInterface::registerHandle(this, token());
m_handle->setProcessSetupData(m_setup);
connect(m_handle, &CallerHandle::errorOccurred, connect(m_handle, &CallerHandle::errorOccurred,
this, &ProcessInterface::errorOccurred); this, &ProcessInterface::errorOccurred);
connect(m_handle, &CallerHandle::started, connect(m_handle, &CallerHandle::started,
@@ -526,7 +527,6 @@ public:
private: private:
void doDefaultStart(const QString &program, const QStringList &arguments) override void doDefaultStart(const QString &program, const QStringList &arguments) override
{ {
m_handle->setProcessSetupData(m_setup);
m_handle->start(program, arguments); m_handle->start(program, arguments);
} }