1 files changed, 24 insertions, 18 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index d825493..940d288 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -115,68 +115,74 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
         if (e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
         {
             e->ignore();
             return;
         }
         scrollBy(-10,0);
         break;
     case Key_Up:
         if( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
-        setCurrentItem((currentItem()+count()-1)%count());
-        if(!itemVisible(currentItem())) {
-            if((unsigned int) currentItem() == (count()-1)) {
-                setTopItem(currentItem()-numItemsVisible()+1);
-            } else {
-                setTopItem(topItem()-1);
+        if ( count() ) {
+            setCurrentItem((currentItem()+count()-1)%count());
+            if(!itemVisible(currentItem())) {
+                if((unsigned int) currentItem() == (count()-1)) {
+                    setTopItem(currentItem()-numItemsVisible()+1);
+                } else {
+                    setTopItem(topItem()-1);
+                }
             }
         }
         break;
     case Key_Down:
         if(e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
-        setCurrentItem((currentItem()+1)%count());
-        if(!itemVisible(currentItem())) {
-            if(currentItem() == 0) {
-                setTopItem(0);
-            } else {
-                setTopItem(topItem()+1);
+        if ( count () ) {
+            setCurrentItem((currentItem()+1)%count());
+            if(!itemVisible(currentItem())) {
+                if(currentItem() == 0) {
+                    setTopItem(0);
+                } else {
+                    setTopItem(topItem()+1);
+                }
             }
         }
         break;
     case Key_I:
         QTimer::singleShot( 11, this, SLOT ( oneDown() ) );
         e->ignore();
         break;
     case Key_Shift:
         emit shiftDown();
         break;
     default:
         e->ignore();
         break;
     }
 }
 
 void KNoScrollListBox::oneDown()
 {
-    setCurrentItem((currentItem()+1)%count());
-    if(!itemVisible(currentItem())) {
-        if(currentItem() == 0) {
-            setTopItem(0);
-        } else {
-            setTopItem(topItem()+1);
+    if ( count () ) {
+        setCurrentItem((currentItem()+1)%count());
+        if(!itemVisible(currentItem())) {
+            if(currentItem() == 0) {
+                setTopItem(0);
+            } else {
+                setTopItem(topItem()+1);
+            }
         }
     }
 }
 void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 {
     switch(e->key()) {
     case Key_Shift:
         emit shiftUp();
         break;
     default:
         break;
     }