1 files changed, 5 insertions, 2 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 937aaae..1139bd7 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -1,121 +1,124 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "ablabel.h"
 
 #include <qpe/stringutil.h>
 
 #include <qregexp.h>
 #include <qstylesheet.h>
 
 AbLabel::AbLabel( QWidget *parent, const char *name ): 
         QTextView( parent, name ),
         m_empty( false )
 {
 }
 
 AbLabel::~AbLabel()
 {
 }
 
 void AbLabel::setContacts( const OContactAccess::List& viewList )
 {
         m_viewList = viewList;
         if (m_viewList.count() != 0){
                 m_empty = false;
                 m_itCurContact = m_viewList.begin();
                 sync();
         }else{
                 // m_itCurContact.clear();
                 m_empty = true;
                 setText( "" );
         }
 }
 
 int AbLabel::currentEntry_UID()
 {
-        OContact contact = *m_itCurContact;
+        OContact contact = currentEntry();
 
         if ( contact.isEmpty() )
                 return 0;
         else
                 return ( contact.uid() );
 }
 
 OContact AbLabel::currentEntry()
 {
-        return ( *m_itCurContact );
+        if ( ! m_empty )
+                return ( *m_itCurContact );
+        else
+                return OContact();
 }
 
 
 bool AbLabel::selectContact( int UID )
 {
         
         for ( m_itCurContact = m_viewList.begin(); m_itCurContact != m_viewList.end(); ++m_itCurContact){
                 if ( (*m_itCurContact).uid() == UID )
                         break;
         }
         sync();
 
         return true;
 }
 
 
 
 void AbLabel::sync()
 {
     QString text = (*m_itCurContact).toRichText();
     setText( text );
 }
 
 void AbLabel::keyPressEvent( QKeyEvent *e )
 {
         // Commonly handled keys
         if ( !m_empty ){
                 switch( e->key() ) {
                 case Qt::Key_Left:
                         qWarning( "Left..");
                 case Qt::Key_Right:
                         qWarning( "Right..");
                 case Qt::Key_F33:
                         qWarning( "OK..");
                         emit signalOkPressed();
                         break;
                 case Qt::Key_Up:
                         qWarning( "UP..");
                         --m_itCurContact;
                         if ( *m_itCurContact != OContact() )
                                 sync();
                         else
                                 m_itCurContact = m_viewList.end();
                         
                         break;
                 case Qt::Key_Down:
                         qWarning( "DOWN..");
                         ++m_itCurContact;
                         if ( *m_itCurContact != OContact() )
                                 sync();
                         else
                                 m_itCurContact = m_viewList.begin();
                         break;
                 }
         }
 
 }