Fixed thumbnail delete ordering issues (also found ffsup2).

Fixed minor memory leak found by valgrind.

Fixed thumbnail processing ordering issue.
This commit is contained in:
Steve Herrell
2010-11-15 20:56:26 -05:00
parent a9cd01f992
commit a9a8141b20
5 changed files with 20 additions and 8 deletions

View File

@@ -97,7 +97,7 @@ public:
// nothing to do; could be jobs have been removed
if ( jobs_.empty() )
{
DEBUG("processing: nothing to do (%d,%d)",paused_,jobs_.empty());
DEBUG("processing: nothing to do (%d)",jobs_.empty());
return;
}
@@ -114,12 +114,15 @@ public:
}
// see if any none upgrade jobs exist
for ( i = jobs_.begin(); i != jobs_.end(); ++i)
if ( i == jobs_.end() )
{
if ( !i->upgrade_ )
for ( i = jobs_.begin(); i != jobs_.end(); ++i)
{
DEBUG("processing(not-upgrade) %s",i->thumbnail_->getFileName().c_str());
break;
if ( !i->upgrade_ )
{
DEBUG("processing(not-upgrade) %s",i->thumbnail_->getFileName().c_str());
break;
}
}
}