[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kxkb
From:       Andriy Rysin <arysin () gmail ! com>
Date:       2008-12-20 17:22:54
Message-ID: 1229793774.688137.470.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 899403 by rysin:

Fixing index out of range assert
BUG: 168925


 M  +5 -4      kxkbcore.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/kxkb/kxkbcore.cpp #899402:899403
@@ -478,21 +478,22 @@
     const QList<LayoutUnit>& lus = xkbConfig.layouts;
     if( lus.count() > 0 ) {
         if( lus != m_kxkbConfig.m_layouts ) {
+            if( group >= m_kxkbConfig.m_layouts.count() )
+                group = 0;
             m_currentLayout = group;
             m_kxkbConfig.setConfiguredLayouts(xkbConfig);
             m_layoutOwnerMap->reset();
             initTray();
         }
         else {
-            kDebug() << "no change in layouts";
+            kDebug() << " no change in layouts";
         }
-
         updateIndicator(group, 1);
     }
     else {
-        kWarning() << "failed to get layouts from server";
+        kWarning() << " failed to get layouts from server";
         if( m_currentLayout != group && group < m_kxkbConfig.m_layouts.count() ) {
-	    kDebug() << "...tryin to set at least group" << group;
+	    kDebug() << " ...tryin to set at least group" << group;
 	    updateIndicator(group, 1);
         }
     }
[prev in list] [next in list] [prev in thread] [next in thread]