# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284488376 -10800
# Node ID ea11b8c1e6a4a06a79321761ba7ed5906f2856b8
# Parent  cd54903d48da1463ad31730427ba6a645631a32d
Revision: 201033
Kit: 201035

diff -r cd54903d48da -r ea11b8c1e6a4 help/data/xhtml.zip
Binary file help/data/xhtml.zip has changed
diff -r cd54903d48da -r ea11b8c1e6a4 profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp
--- a/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp	Wed Sep 01 12:30:29 2010 +0100
+++ b/profilesapplication/Profiles/ProfileApp/SettingsViewSrc/CProfilePlayingVolumeSettingPage.cpp	Tue Sep 14 21:19:36 2010 +0300
@@ -205,6 +205,13 @@
 //
 void CProfilePlayingVolumeSettingPage::CheckRingingToneTypeL()
 	{
+    // If the preview tone is not NULL, delete it.
+    if ( iPreviewTone )
+        {
+        delete iPreviewTone;
+        iPreviewTone = NULL;
+        }
+    
 	// Get default tone from cenrep
 	TFileName defaultTone;
 	CRepository* cenrep = CRepository::NewL( KCRUidProfileEngine );
diff -r cd54903d48da -r ea11b8c1e6a4 profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp
--- a/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Wed Sep 01 12:30:29 2010 +0100
+++ b/profilesapplication/Profiles/ProfileApp/UIsrc/CProfileMainView.cpp	Tue Sep 14 21:19:36 2010 +0300
@@ -472,6 +472,7 @@
 			CAknErrorNote* note = new( ELeave ) CAknErrorNote( ETrue );
 			note->ExecuteLD( *errorText );
 			CleanupStack::PopAndDestroy( errorText );
+            CleanupStack::PopAndDestroy( expiryTime );
     		return;
     		}