ff058d499c
- fix crashes when adding a new network folder (kdebug:162285) - KFileMetaInfo freezes when Strigi indexes non-sequential files (kdebug:163050) - renaming in FTP overwrites existing files without confirmation (kdebug:127793)
26 lines
684 B
Diff
26 lines
684 B
Diff
--- kdelibs/kio/kio/job.cpp 2008/06/02 11:36:24 815621
|
|
+++ kdelibs/kio/kio/job.cpp 2008/06/02 11:38:26 815622
|
|
@@ -2096,14 +2096,20 @@
|
|
else if (job == d->m_getJob)
|
|
{
|
|
d->m_getJob = 0L;
|
|
- if (d->m_putJob)
|
|
+ if (d->m_putJob)
|
|
+ {
|
|
d->m_putJob->kill( Quietly );
|
|
+ removeSubjob( d->m_putJob );
|
|
+ }
|
|
}
|
|
else if (job == d->m_putJob)
|
|
{
|
|
d->m_putJob = 0L;
|
|
- if (d->m_getJob)
|
|
+ if (d->m_getJob)
|
|
+ {
|
|
d->m_getJob->kill( Quietly );
|
|
+ removeSubjob( d->m_getJob );
|
|
+ }
|
|
}
|
|
setError( job->error() );
|
|
setErrorText( job->errorText() );
|