Mercurial > hg > easyhg
comparison hgrunner.cpp @ 195:ff0d76dcb3b8
* Don't close proc input on finished() -- causes crash on program failure on Windows
* Use merge binary from settings, even if empty -- sometimes user may wish to set an empty string to avoid having an external merge program
* Revert labels to line edits in settings dialog, for a similar reason (permit setting empty value)
* Avoid showing hard hyphens on Windows, they don't look right
* Use preformatted text for merge outcome dialog (but format3 would be better)
author | Chris Cannam |
---|---|
date | Fri, 24 Dec 2010 13:14:45 +0000 |
parents | 6bb510abe4f1 |
children | c5fceb3fe5b4 |
comparison
equal
deleted
inserted
replaced
194:5ca49523892f | 195:ff0d76dcb3b8 |
---|---|
346 HgAction completedAction = m_currentAction; | 346 HgAction completedAction = m_currentAction; |
347 | 347 |
348 m_isRunning = false; | 348 m_isRunning = false; |
349 m_currentAction = HgAction(); | 349 m_currentAction = HgAction(); |
350 | 350 |
351 closeProcInput(); | 351 //closeProcInput(); |
352 m_proc->deleteLater(); | 352 m_proc->deleteLater(); |
353 m_proc = 0; | 353 m_proc = 0; |
354 | 354 |
355 if (completedAction.action == ACT_NONE) { | 355 if (completedAction.action == ACT_NONE) { |
356 DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl; | 356 DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl; |