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
@@ -95,108 +95,114 @@ QString KNoScrollListBox::getWhatsThisText(QPoint p)
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
  
     switch(e->key()) {
     case Key_Right:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
         }
         scrollBy(10,0);
         break;
     case Key_Left:
         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;
     }
 }
 
 void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
 {
     QListBox::mousePressEvent(e);
 
     if(e->button() == RightButton) {
         emit rightClick();
     }
 }
 
 MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     : QListBoxItem()
 {
     mblockRepaint = true;
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;