diff -r 8fcb49b86877 -r 3b47783fdf16 gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp --- a/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Tue May 11 16:28:56 2010 +0300 +++ b/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Tue May 25 13:00:04 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include "GsLogger.h" -#include +#include #include #include "GSBaseDocument.h" #include @@ -859,7 +859,11 @@ // void CGSParentContainer::RestoreListBoxPositionL( const CGSParentPlugin::TListBoxPosition& aPosition, TBool aScreenModeChanged ) { - if ( aPosition.iCurrentItemIndex >= 0 ) + if( iListBox->View()->BottomItemIndex()>= aPosition.iCurrentItemIndex ) + + { + + if ( aPosition.iCurrentItemIndex >= 0 ) { iListBox->SetCurrentItemIndex( aPosition.iCurrentItemIndex ); } @@ -874,5 +878,6 @@ iListBox->View()->SetItemOffsetInPixels( aPosition.iItemOffsetInPixels ); iListBox->View()->SetTopItemIndex( aPosition.iTopItemIndex ); } + } } //End of File