Changeset View
Changeset View
Standalone View
Standalone View
src/core/filecopyjob.cpp
Show First 20 Lines • Show All 485 Lines • ▼ Show 20 Line(s) | 484 | if (d->m_putJob) { | |||
---|---|---|---|---|---|
486 | removeSubjob(d->m_putJob); | 486 | removeSubjob(d->m_putJob); | ||
487 | } | 487 | } | ||
488 | } else if (job == d->m_putJob) { | 488 | } else if (job == d->m_putJob) { | ||
489 | d->m_putJob = nullptr; | 489 | d->m_putJob = nullptr; | ||
490 | if (d->m_getJob) { | 490 | if (d->m_getJob) { | ||
491 | d->m_getJob->kill(Quietly); | 491 | d->m_getJob->kill(Quietly); | ||
492 | removeSubjob(d->m_getJob); | 492 | removeSubjob(d->m_getJob); | ||
493 | } | 493 | } | ||
494 | } else if (job == d->m_chmodJob) { | ||||
495 | d->m_chmodJob = nullptr; | ||||
hallas: Should we also set d->m_chmodJob to nullptr here, just like the m_putJob handling branch? | |||||
dfaure: Right, probably a good idea, just in case. | |||||
496 | if (d->m_delJob) { | ||||
497 | d->m_delJob->kill(Quietly); | ||||
498 | removeSubjob(d->m_delJob); | ||||
499 | } | ||||
500 | } else if (job == d->m_delJob) { | ||||
Should we also set d->m_delJob to nullptr here, just like the m_putJob handling branch? hallas: Should we also set d->m_delJob to nullptr here, just like the m_putJob handling branch? | |||||
dfaure: same | |||||
501 | d->m_delJob = nullptr; | ||||
502 | if (d->m_chmodJob) { | ||||
503 | d->m_chmodJob->kill(Quietly); | ||||
504 | removeSubjob(d->m_chmodJob); | ||||
505 | } | ||||
494 | } | 506 | } | ||
495 | setError(job->error()); | 507 | setError(job->error()); | ||
496 | setErrorText(job->errorText()); | 508 | setErrorText(job->errorText()); | ||
497 | emitResult(); | 509 | emitResult(); | ||
498 | return; | 510 | return; | ||
499 | } | 511 | } | ||
500 | 512 | | |||
501 | if (d->m_mustChmod) { | 513 | if (d->m_mustChmod) { | ||
▲ Show 20 Lines • Show All 72 Lines • Show Last 20 Lines |
Should we also set d->m_chmodJob to nullptr here, just like the m_putJob handling branch?