diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-06-03 12:07:56 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-06-03 12:03:43 +0200 |
| commit | b79449beddfc8c005c7bab6febdab2162827e735 (patch) | |
| tree | 6a6587eafc37cf4c0fffce18debe54e9b29f4b42 /src/plugins/git | |
| parent | be25be4705b091d280b6f2051d55784ffbcd2ead (diff) | |
| download | qt-creator-b79449beddfc8c005c7bab6febdab2162827e735.tar.gz | |
Git: Fix mergetool prompt replies
Task-number: QTCREATORBUG-12335
Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/mergetool.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index 10cc502d68..5df7b3e32b 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -225,6 +225,7 @@ void MergeTool::chooseAction() ba.append(key.toChar().toLatin1()); ba.append('\n'); m_process->write(ba); + m_process->waitForBytesWritten(); } void MergeTool::addButton(QMessageBox *msgBox, const QString &text, char key) @@ -254,6 +255,7 @@ void MergeTool::readData() } else { m_process->write("n\n"); } + m_process->waitForBytesWritten(); } } } |