X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Key.cpp;h=3dd78761e1c3875cf585b43955b56f3cff8a2282;hb=1cd99f1d6252ccfd70cea70a86f6977e4f2d6e6d;hp=43bf64f29694cc70b638060fc24c9a0fceca9139;hpb=ff25631b7adfad7c615c3f552478e4ebf91adf35;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp
index 43bf64f..3dd7876 100644
--- a/source/contacteditor/frmContactEditor-Key.cpp
+++ b/source/contacteditor/frmContactEditor-Key.cpp
@@ -23,12 +23,9 @@ void frmContactEditor::AddKey( wxCommandEvent& event )
 {
 	
 	// Bring up the window for adding a key.
-	
-	int intResult = 0;
-    
+	    
 	frmContactEditorKey *frameCEKey = new frmContactEditorKey ( this );
 	frameCEKey->SetEditorMode(FALSE);
-	intResult = GetLastInt(&ContactEditorData.KeyList);
 	frameCEKey->SetupPointers(&ContactEditorData.KeyList,
 		&ContactEditorData.KeyListAltID,
                 &ContactEditorData.KeyListPID,
@@ -53,7 +50,7 @@ void frmContactEditor::ModifyKey( wxCommandEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboKeys,
+	if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys,
 		&longSelected,
                 &intSelectedData)){
 		return;
@@ -85,7 +82,7 @@ void frmContactEditor::DeleteKey( wxCommandEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboKeys,
+	if (lboKeys->GetItemCount() == 0 || !GetSelectedItem(lboKeys,
 		&longSelected,
 		&intSelectedData)){
 		return;