Fixing nullpointer crash if "emails" selected

1 files changed, 5 insertions, 1 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 1b83308..b68d88c 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -622,113 +622,117 @@ void ContactEditor::init() {
 	connect( txtState, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotStateChange(const QString &)) );
 	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::populateDefaultEmailCmb(){       
 	cmbDefaultEmail->clear();    
 	cmbDefaultEmail->insertStringList(emails);
 	for ( int i = 0; i < cmbDefaultEmail->count(); i++){
 	  qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",cmbDefaultEmail->text( i ).latin1(),defaultEmail.latin1());
 	  if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
 	      cmbDefaultEmail->setCurrentItem( i );
 		qDebug("set");
 		}
 	}
 }
 
 void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
 	QString type = slChooserNames[index];
 	qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",type.latin1(),textChanged.latin1(), index,  widgetPos );
         if ( type == "Default Email"){         
 	  defaultEmail = textChanged;
-	  if (cmbDefaultEmail) delete cmbDefaultEmail;
+	  if (cmbDefaultEmail){  
+		  delete cmbDefaultEmail;
+		  cmbDefaultEmail = 0l;
+	  }
 	  cmbDefaultEmail = new QComboBox(inputWid->parentWidget());	   
 	  cmbDefaultEmail->setGeometry(inputWid->frameGeometry()); 
 	  cmbDefaultEmail->show();
 	  populateDefaultEmailCmb();
  	  connect(cmbDefaultEmail,SIGNAL(activated(int)),
 		  SLOT(defaultEmailChanged(int))); 
 	  defaultEmailChooserPosition = widgetPos;
         }else if (defaultEmailChooserPosition == widgetPos){
 	qDebug("cmbDefaultEmail->hide()");
 	  if (cmbDefaultEmail) cmbDefaultEmail->hide();
 	  widgetPos=-1;
 	}else if (type == "Emails"){
 	  qDebug("emails");
 	  QString de;
 	  emails = QStringList::split (",", textChanged );
 
+	  if ( cmbDefaultEmail )
 	  populateDefaultEmailCmb();
 	}
 	
 
 
 	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
 	chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
 	chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
 	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[0] = textChanged;
 	} else {
 		slHomeAddress[0] = textChanged;
 	}
 }
 
 void ContactEditor::slotAddress2Change( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[1] = textChanged;
 	} else {
 		slHomeAddress[1] = textChanged;
 	}
 }
 
 void ContactEditor::slotPOBoxChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[2] = textChanged;