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

Git: Fix mergetool prompt replies

Browse Source 
Task-number: QTCREATORBUG-12335
Change-Id: I68c36412f517072f551102b53cac2eeeff22f1e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-03 12:07:56 +03:00
committed by Orgad Shaneh
parent be25be4705
commit b79449bedd
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/mergetool.cpp
View File

@@ -225,6 +225,7 @@ void MergeTool::chooseAction()
ba.append(key.toChar().toLatin1()); ba.append(key.toChar().toLatin1());
ba.append('\n'); ba.append('\n');
m_process->write(ba); m_process->write(ba);
m_process->waitForBytesWritten();
} }
void MergeTool::addButton(QMessageBox *msgBox, const QString &text, char key) void MergeTool::addButton(QMessageBox *msgBox, const QString &text, char key)
@@ -254,6 +255,7 @@ void MergeTool::readData()
} else { } else {
m_process->write("n\n"); m_process->write("n\n");
} }
m_process->waitForBytesWritten();
} }
} }
} }