X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorKey.cpp;h=569b0c3ab766da74d31f73856d83c5abac3047cc;hb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;hp=bcac1f534feab6ffcd81395ed3d8d6a0043972e6;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorKey.cpp b/source/contacteditor/frmContactEditorKey.cpp
index bcac1f5..569b0c3 100644
--- a/source/contacteditor/frmContactEditorKey.cpp
+++ b/source/contacteditor/frmContactEditorKey.cpp
@@ -37,12 +37,15 @@ frmContactEditorKeyADT( parent )
 	cmbKeyMainType->Append(_("URL"));
 	cmbKeyMainType->Append(_("Key"));
 	
+	cmbType->Append("");
 	cmbType->Append(_("Home"));
 	cmbType->Append(_("Work"));
 	
 	cmbURL->Append(_("PGP Key"));
 	
 	cmbKeyType->Append(_("PGP Key"));
+	
+	cmbType->SetSelection(0);
 
 }
 
@@ -110,7 +113,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 			
 			striter = KeyListDataTypePtr->find(KeyListIndex);
 			
-			if (striter->first == KeyListIndex){
+			if (striter->first == KeyListIndex &&
+				striter != KeyListDataTypePtr->end()){
 			
 				strValue = striter->second;
 			
@@ -149,7 +153,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 			
 			striter = KeyListDataTypePtr->find(KeyListIndex);
 			
-			if (striter->first == KeyListIndex){
+			if (striter->first == KeyListIndex &&
+				striter != KeyListDataTypePtr->end()){
 			
 				strValue = striter->second;
 			
@@ -165,7 +170,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 		
 		striter = KeyListTypePtr->find(KeyListIndex);	
 		
-		if (striter->first == KeyListIndex){
+		if (striter->first == KeyListIndex &&
+			striter != KeyListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -189,7 +195,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 		
 		intiter = KeyListPrefPtr->find(KeyListIndex);
 		
-		if (intiter->first == KeyListIndex && intiter->second > 0){
+		if (intiter->first == KeyListIndex && intiter->second > 0 &&
+			intiter != KeyListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();