Fixing nullpointer crash if "emails" selected

1 files changed, 6 insertions, 2 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
@@ -666,9 +666,12 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QLineE
 	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();
@@ -683,9 +686,10 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QLineE
 	  qDebug("emails");
 	  QString de;
 	  emails = QStringList::split (",", textChanged );
 
-	  populateDefaultEmailCmb();
+	  if ( cmbDefaultEmail )
+		  populateDefaultEmailCmb();
 	}