# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1287755003 -3600
# Node ID 453a466b0a433ef18e5a5a9dfdd051bcb4b92341
# Parent  4cb0291370d024a2e46927ff7ba97d42a64acfdc# Parent  bb3bc0aea200977e749d0926ea4e3d299e091601
Merge

diff -r bb3bc0aea200 -r 453a466b0a43 ImagePrint/ImagePrintUI/imageprintapp/src/cimageprintappui.cpp
--- a/ImagePrint/ImagePrintUI/imageprintapp/src/cimageprintappui.cpp	Thu Sep 02 15:45:15 2010 +0100
+++ b/ImagePrint/ImagePrintUI/imageprintapp/src/cimageprintappui.cpp	Fri Oct 22 14:43:23 2010 +0100
@@ -428,6 +428,11 @@
 		HBufC* buf = StringLoader::LoadLC( R_QTN_PRINT_SELECTNEW_NOTE );
 		errornote->ExecuteLD( *buf );
 		CleanupStack::PopAndDestroy( buf );
+		CleanupStack::PopAndDestroy(paramList);
+	    readStream.Close();
+	    readStream.Pop();
+	    CleanupStack::PopAndDestroy( &fileServer );
+	    delete imageFiles;
 		Exit();
     	}
 
diff -r bb3bc0aea200 -r 453a466b0a43 ImagePrint/ImagePrintUI/imageprinteng/src/cidleprinteventcatcher.cpp
--- a/ImagePrint/ImagePrintUI/imageprinteng/src/cidleprinteventcatcher.cpp	Thu Sep 02 15:45:15 2010 +0100
+++ b/ImagePrint/ImagePrintUI/imageprinteng/src/cidleprinteventcatcher.cpp	Fri Oct 22 14:43:23 2010 +0100
@@ -124,18 +124,16 @@
                     	CAknErrorNote* errornote = new CAknErrorNote( ETrue );  
 						TInt err ( KErrNone );
 		        		TRAP( err, errornote->ExecuteLD( *iBuf ));		        				        			
-											
+	                    if ( iBuf )
+	                        {
+	                        delete iBuf;
+	                        iBuf = NULL;
+	                        }											
                     	}
                     for( TInt i=0; i<obsCount; i++ )
                         {
                         iObservers[i]->UsbPrinterDisconnected();                    
-                        }
-                    if ( iBuf )
-                    	{
-                    	delete iBuf;
-                    	iBuf = NULL;
-                    	}
-                    
+                        }                    
                     }
                 }
             break;