fix

1 files changed, 4 insertions, 1 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 7338eeb..f125edb 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -36,68 +36,71 @@
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qpopupmenu.h> 
 #include <qlistbox.h> 
 #include <qhbox.h>
 #include <qaction.h>
 #include <qiconset.h> 
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
                      QString &strAll );
 
 // helper convert from file format to comma delimited...
 //void parseEmailTo( const QString &strDefaultEmail,
         //         const QString &strOtherEmail, QString &strBack );
 
         ContactEditor::ContactEditor(const OContact &entry,
                                 QWidget *parent,
                                 const char *name,
                                 WFlags fl )
         : QDialog( parent, name, TRUE, fl ),
           m_personalView ( false )
+          
 {
 
         init();
         setEntry( entry );
+
+        cmbDefaultEmail = 0;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
 
         useFullName = true;
 
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
                 slHomeAddress.append( "" );
                 slBusinessAddress.append( "" );
         }
 
         trlChooserNames   = OContactFields::trphonefields();
         slChooserNames    = OContactFields::untrphonefields();
         slDynamicEntries  = OContactFields::untrdetailsfields();
         trlDynamicEntries = OContactFields::trdetailsfields();
         for (i = 0; i < slChooserNames.count(); i++)
           slChooserValues.append("");
 
 
         QVBoxLayout *vb = new QVBoxLayout( this );
 
         tabMain = new QTabWidget( this );
         vb->addWidget( tabMain );
 
         QWidget *tabViewport = new QWidget ( tabMain );
@@ -602,65 +605,65 @@ void ContactEditor::init() {
         connect( txtZip, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotZipChange(const QString &)) );
         connect( cmbCountry, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotCountryChange(const QString &)) );
         connect( cmbCountry, SIGNAL(activated(const QString &)),
                  this, SLOT(slotCountryChange(const QString &)) );
         connect( cmbChooserField1, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser1Change(int)) );
         connect( cmbChooserField2, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser2Change(int)) );
         connect( cmbChooserField3, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser3Change(int)) );
         connect( cmbChooserField4, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser4Change(int)) );
         connect( cmbAddress, SIGNAL(activated(int)),
                  this, SLOT(slotAddressTypeChange(int)) );
 
         new QPEDialogListener(this);
 
         setPersonalView ( m_personalView );
 }
 
 void ContactEditor::defaultEmailChanged(int i){
   qDebug("defaultEmailChanged");
         int index = cmbChooserField1->currentItem();
         slChooserValues[index] = cmbDefaultEmail->text(i);
 
 }
 
 void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid ) {
 
         if (slChooserNames[index] == "Default Email"){         
-          delete cmbDefaultEmail;
+          if (cmbDefaultEmail) delete cmbDefaultEmail;
                   cmbDefaultEmail = new QComboBox(inputWid->parentWidget());   
           cmbDefaultEmail->setGeometry(inputWid->frameGeometry());        
           cmbDefaultEmail->insertStringList(ent.emailList());
           connect(cmbDefaultEmail,SIGNAL(activated(int)),
                   SLOT(defaultEmailChanged(int))); 
           QString demail = ent.defaultEmail();
           for ( int i = 0; i < cmbDefaultEmail->count(); i++)
             if ( cmbDefaultEmail->text( i ) == demail )
               cmbDefaultEmail->setCurrentItem( i );
 
           cmbDefaultEmail->show();
         }
 
 
         slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
         chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
         chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
         chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {