alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This hopefully fixes a double delete bug. I don't see what would prevent both

Browse Source 
RunnerManager::jobDone() and DelayedJobCleaner::jobDone() from being invoked
if the JobDone() signal is emitted just at the right (wrong) time.
Both jobDone() slots delete (as in delete operator) the job.
CCMAIL:aseigo@kde.org

svn path=/trunk/KDE/kdelibs/; revision=1033035
This commit is contained in:
Andreas Hartmetz 2009-10-09 09:33:20 +00:00
parent 633d51612c
commit d0ecf4ae88
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/runnerjobs.cpp
View File

@ -190,7 +190,7 @@ void DelayedJobCleaner::jobDone(ThreadWeaver::Job *job)
} }
m_jobs.remove(runJob); m_jobs.remove(runJob);
delete runJob; runJob->deleteLater();
if (m_jobs.isEmpty()) { if (m_jobs.isEmpty()) {
deleteLater(); deleteLater();

4
runnermanager.cpp
View File

@ -191,13 +191,13 @@ public:
if (deferredRun.isEnabled() && runJob->runner() == deferredRun.runner()) { if (deferredRun.isEnabled() && runJob->runner() == deferredRun.runner()) {
//kDebug() << "job actually done, running now **************"; //kDebug() << "job actually done, running now **************";
QueryMatch tmpRun = deferredRun; QueryMatch tmpRun = deferredRun;
deferredRun = QueryMatch(0); deferredRun = QueryMatch(0);
tmpRun.run(context); tmpRun.run(context);
} }
searchJobs.remove(runJob); searchJobs.remove(runJob);
oldSearchJobs.remove(runJob); oldSearchJobs.remove(runJob);
delete runJob; runJob->deleteLater();
if (searchJobs.isEmpty() && context.matches().isEmpty()) { if (searchJobs.isEmpty() && context.matches().isEmpty()) {
// we finished our run, and there are no valid matches, and so no // we finished our run, and there are no valid matches, and so no