Merge branch 'anatoly_dev' of github.com:Sankore/Sankore-3.1 into anatoly_dev

12 years ago · 1596b37896
parent eb53715d6c a3be61c15b
commit 1596b37896
1 changed files with 4 additions and 1 deletions
--- a/src/gui/UBKeyboardPalette.cpp
+++ b/src/gui/UBKeyboardPalette.cpp
@ -60,7 +60,10 @@ UBKeyboardPalette::UBKeyboardPalette(QWidget *parent)
    createCtrlButtons();

    nCurrentLocale = UBSettings::settings()->KeyboardLocale->get().toInt();
-    setInput(locales[nCurrentLocale]);
+	if (nCurrentLocale < 0 || nCurrentLocale >= nLocalesCount)
+		nCurrentLocale = 0;
+	if (locales!=NULL)
+	    setInput(locales[nCurrentLocale]);

    setContentsMargins( 22, 22, 22, 22 );