Mercurial > hg > easyhg
comparison src/hgrunner.cpp @ 564:39cac58b4f92
Add commandCancelled signal -- but don't make use of it; it didn't work out as I'd hoped
author | Chris Cannam |
---|---|
date | Tue, 28 Feb 2012 16:59:25 +0000 |
parents | 1ff2a1bf0a40 |
children | 012ba1b83328 |
comparison
equal
deleted
inserted
replaced
563:0a094020c2d4 | 564:39cac58b4f92 |
---|---|
337 finished(-1, QProcess::CrashExit); | 337 finished(-1, QProcess::CrashExit); |
338 } | 338 } |
339 | 339 |
340 void HgRunner::finished(int procExitCode, QProcess::ExitStatus procExitStatus) | 340 void HgRunner::finished(int procExitCode, QProcess::ExitStatus procExitStatus) |
341 { | 341 { |
342 if (!m_proc) return; | 342 if (!m_proc) return; |
343 | 343 |
344 // Save the current action and reset m_currentAction before we | 344 // Save the current action and reset m_currentAction before we |
345 // emit a signal to mark the completion; otherwise we may be | 345 // emit a signal to mark the completion; otherwise we may be |
346 // resetting the action after a slot has already tried to set it | 346 // resetting the action after a slot has already tried to set it |
347 // to something else to start a new action | 347 // to something else to start a new action |
348 | 348 |
349 HgAction completedAction = m_currentAction; | 349 HgAction completedAction = m_currentAction; |
375 checkQueue(); | 375 checkQueue(); |
376 } | 376 } |
377 | 377 |
378 void HgRunner::killCurrentActions() | 378 void HgRunner::killCurrentActions() |
379 { | 379 { |
380 HgAction current = m_currentAction; | |
380 m_queue.clear(); | 381 m_queue.clear(); |
381 killCurrentCommand(); | 382 killCurrentCommand(); |
383 emit commandCancelled(current); | |
382 } | 384 } |
383 | 385 |
384 void HgRunner::killCurrentCommand() | 386 void HgRunner::killCurrentCommand() |
385 { | 387 { |
386 if (m_isRunning) { | 388 if (m_isRunning) { |