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

MergeTool: Don't call blocking waitForStarted()

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2022-06-22 07:28:15 +02:00
parent 35c3d9430b
commit 94adc1a566
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.cpp
View File

@@ -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