--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp	Thu May 27 13:11:20 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp	Fri Jun 11 13:58:45 2010 +0300
@@ -95,12 +95,6 @@
     iActivityManager = CTMActivityManager::NewL( this, KBackgroundGenerationIdle);
 
     UpdatePSValues(ETrue);
-
-    if(iForegroundGenerationObserver)
-        {
-        delete iForegroundGenerationObserver;
-        iForegroundGenerationObserver = NULL;
-        }
     
     RProperty::Define(KTAGDPSNotification, KMPXHarvesting, RProperty::EInt);
     
@@ -167,6 +161,12 @@
         iForegroundGenerationObserver = NULL;
         }
     
+    if(iFormatObserver)
+        {
+        delete iFormatObserver;
+        iFormatObserver = NULL;
+        }
+    
     if ( iCollectionUtility )
         {
         iCollectionUtility->Close();
@@ -188,8 +188,6 @@
         iTMSession = NULL;
         }
     
-    delete iFormatObserver;
-    
     TN_DEBUG1( "CThumbAGProcessor::~CThumbAGProcessor() - end" );
     }
 
@@ -684,13 +682,14 @@
                     }
                 }
             
-		   // Symbian^4 specific
+		   // Symbian^4 specific --->
            if( imageObjectDef.Id() != aObject->Def().Id()  )
                 {
                 TN_DEBUG1( "CThumbAGProcessor::CreateThumbnailsL() 1st round not image");
                 ActivateAO();
                 return;
                 }
+			//Symbian^4 specific <---
             }
 
         // run as lower priority than getting but higher that creating thumbnails