# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268401297 -7200
# Node ID 8812206c49a00527e0c6edc69472552a30efd0e1
# Parent  1e73d2d04cbc567c9b79b2fcf4231aa87702fd84
Revision: 201006
Kit: 201008

diff -r 1e73d2d04cbc -r 8812206c49a0 filemanager/App/src/CFileManagerBackupView.cpp
--- a/filemanager/App/src/CFileManagerBackupView.cpp	Fri Feb 19 22:41:53 2010 +0200
+++ b/filemanager/App/src/CFileManagerBackupView.cpp	Fri Mar 12 15:41:37 2010 +0200
@@ -112,10 +112,7 @@
     {
     FUNC_LOG
 
-    if ( iContainer )
-        {
-        iContainer->RefreshListL( iIndex );
-        }
+    TRAP_IGNORE( RefreshSettingsL() );
     }
 
 // ----------------------------------------------------------------------------
diff -r 1e73d2d04cbc -r 8812206c49a0 filemanager/App/src/CFileManagerFileListContainer.cpp
--- a/filemanager/App/src/CFileManagerFileListContainer.cpp	Fri Feb 19 22:41:53 2010 +0200
+++ b/filemanager/App/src/CFileManagerFileListContainer.cpp	Fri Mar 12 15:41:37 2010 +0200
@@ -210,14 +210,18 @@
              
     TUid enabledViewUid = enabledViewId.iViewUid;
     CAknView* enabledView = iAppUi->View( enabledViewUid );
-    CEikMenuBar* menuBar = enabledView->MenuBar();
+    CEikMenuBar* menuBar = NULL;
     
+    if ( iAppUi->IsFileManagerView( enabledViewUid ) )
+        {
+        menuBar = enabledView->MenuBar();
+        }
     switch( aKeyEvent.iCode )
         {
         case EKeyEnter: // FALLTHROUH
         case EKeyOK:
             {
-            if ( menuBar->ItemSpecificCommandsEnabled() )
+            if ( ( menuBar != NULL ) && menuBar->ItemSpecificCommandsEnabled() )
                 {
                 iAppUi->ProcessCommandL( EFileManagerSelectionKey );
                 response = EKeyWasConsumed;
@@ -227,7 +231,7 @@
         case EKeyDelete:    // FALLTHROUGH
         case EKeyBackspace:
             {
-            if ( menuBar->ItemSpecificCommandsEnabled() )
+            if ( ( menuBar != NULL ) && menuBar->ItemSpecificCommandsEnabled() )
                 {
                 iAppUi->ProcessCommandL( EFileManagerDelete );
                 response = EKeyWasConsumed;
diff -r 1e73d2d04cbc -r 8812206c49a0 filemanager/View/src/CFileManagerFileNameQueryDlg.cpp
--- a/filemanager/View/src/CFileManagerFileNameQueryDlg.cpp	Fri Feb 19 22:41:53 2010 +0200
+++ b/filemanager/View/src/CFileManagerFileNameQueryDlg.cpp	Fri Mar 12 15:41:37 2010 +0200
@@ -160,15 +160,16 @@
         TUint32 fileType( 0 );
 
         TRAPD( err, fileType = iEngine.FileTypeL( ptrUserTextFullPath ) );
-        if ( err != KErrNone && err != KErrAccessDenied )
+        if ( err != KErrNone && err != KErrNotFound && err != KErrAccessDenied )
             {
             User::Leave( err );
             }
 
-        if( ( fileType & ( CFileManagerItemProperties::EOpen |
+        if( ( err == KErrNotFound ) ||
+            ( err == KErrAccessDenied ) ||
+            ( fileType & ( CFileManagerItemProperties::EOpen |
                            CFileManagerItemProperties::EReadOnly |
-                           CFileManagerItemProperties::EFolder ) ) ||
-            ( err == KErrAccessDenied ) )
+                           CFileManagerItemProperties::EFolder ) ) )
             {
             FileManagerDlgUtils::ShowInfoNoteL(
                 R_QTN_FLDR_NAME_ALREADY_USED, Text() );