diff -r 2f259fa3e83a -r 8ca85d2f0db7 uifw/AvKon/src/AknPopupSettingPage.cpp --- a/uifw/AvKon/src/AknPopupSettingPage.cpp Tue Feb 02 01:00:49 2010 +0200 +++ b/uifw/AvKon/src/AknPopupSettingPage.cpp Fri Feb 19 23:04:46 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -317,7 +317,8 @@ // ensures that correct item gets selected if setting page is // accepted by clicking the left softkey. if ( iExtension && iExtension->iFlags.IsSet( - CAknPopupSettingListExtension::ESingleClickEnabled ) ) + CAknPopupSettingListExtension::ESingleClickEnabled ) && + ItemExists( iCurrentSelection ) ) { View()->SetCurrentItemIndex( iCurrentSelection ); }