diff -r 18e505e3f370 -r 529f3bf5c2f1 filemanager/Engine/src/CFileManagerUtils.cpp --- a/filemanager/Engine/src/CFileManagerUtils.cpp Wed Jun 09 09:28:11 2010 +0300 +++ b/filemanager/Engine/src/CFileManagerUtils.cpp Mon Jun 21 15:26:15 2010 +0300 @@ -903,8 +903,8 @@ CleanupStack::PushL( usbLetterName ); TPtrC16 driveletter=array->MdcaPoint( KDriveLetterIndex ); - usbLetterName->AppendL( driveletter ); - + usbLetterName->AppendL( driveletter ); + HBufC* usbDriveDefaultName = NULL; if(array->MdcaCount() > 1 ) { TPtrC16 drivename=array->MdcaPoint( KDriveNameIndex ); @@ -912,8 +912,9 @@ } else { - TPtrC16 drivename=_L(""); - usbLetterName->AppendL( drivename ); + usbDriveDefaultName = StringLoader::LoadLC( R_QTN_FMGR_USB_MEMORY_DEFAULT_NAME ); + TPtrC16 drivename = usbDriveDefaultName->Des(); + usbLetterName->AppendL( drivename ); } @@ -921,10 +922,14 @@ aTextIdForDefaultName,*usbLetterName ); CleanupStack::PopAndDestroy( usbLetterName ); - } - else - { - ret = StringLoader::LoadL(aTextIdForDefaultName, array->MdcaPoint( + if ( usbDriveDefaultName ) + { + CleanupStack::PopAndDestroy( usbDriveDefaultName ); + } + } + else + { + ret = StringLoader::LoadL(aTextIdForDefaultName, array->MdcaPoint( KDriveLetterIndex)); } }