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

1596b378 · Ilia Ryabokon · eb53715d · a3be61c1 · 1596b378
Commit 1596b378 authored Sep 04, 2012 by Ilia Ryabokon
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

UBKeyboardPalette.cpp src/gui/UBKeyboardPalette.cpp +4 -1

No files found.
--- 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 );