--- a/textinput/GSLangPlugin/src/GSLangPlugin.cpp	Mon Mar 15 12:42:02 2010 +0200
+++ b/textinput/GSLangPlugin/src/GSLangPlugin.cpp	Wed Mar 31 22:08:20 2010 +0300
@@ -734,10 +734,11 @@
             Container()->UpdateListBoxL( EGSLangIdPredictiveMode );
             }
         TInt current = Container()->Model()->LanguageL( CGSLangModel::EGSInputLanguage );
+        
         if ( ( (current == ELangPrcChinese || current == ELangHongKongChinese
             || current == ELangTaiwanChinese) && previous != current)
-            || ( (current != ELangPrcChinese || current != ELangHongKongChinese
-            || current != ELangTaiwanChinese) && previous != current) )
+            || ( (current != ELangPrcChinese || current != ELangHongKongChinese ) 
+                 && previous != current) )
             {
             if (current == ELangPrcChinese )
                 {
@@ -953,8 +954,8 @@
     if (dlg->ExecuteLD(CAknSettingPage::EUpdateWhenChanged))
         {
         TInt newInputMethodCode=EPinyin;
-
-        for (TInt j = 0; j < KGSMapSize; j++)
+        
+        for (TInt j = 0; j < itemsNum && j < KGSMapSize; j++)
             {
             TInt val = 0;
             if ( lang == ELangPrcChinese )      { val = methodMap[j].index0; }