diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-06-22 07:28:15 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-06-22 06:30:04 +0000 |
| commit | 94adc1a566eaf8e29970e85619ffdc4b64d3561b (patch) | |
| tree | c73bc64536ebe264bab40d5050c7da049096382c /src/plugins/git/gitclient.cpp | |
| parent | 35c3d9430b28a05c200a631ce05f60c24f7889b6 (diff) | |
| download | qt-creator-94adc1a566eaf8e29970e85619ffdc4b64d3561b.tar.gz | |
MergeTool: Don't call blocking waitForStarted()
Connect to done() signal instead of finished().
In case the process failed to start it will delete
itself from inside done handler.
Change-Id: I277779904d571759bf3877860d64e80ad304c2da
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 4b3b59a06d..1a2b211156 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1141,8 +1141,7 @@ void GitClient::diffBranch(const FilePath &workingDirectory, const QString &bran void GitClient::merge(const FilePath &workingDirectory, const QStringList &unmergedFileNames) { auto mergeTool = new MergeTool(this); - if (!mergeTool->start(workingDirectory, unmergedFileNames)) - delete mergeTool; + mergeTool->start(workingDirectory, unmergedFileNames); } void GitClient::status(const FilePath &workingDirectory) const |