X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Picture.cpp;h=fd9d169c5992e1f1b9c0731e55822eacd6dbf869;hb=bfe817b5bfae33a1eb666c463643ec119cd1d66d;hp=cc299444b034de938008b155bd73e45afb91e697;hpb=635993e1cbdacc762a87271fc19d5f8411326886;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Picture.cpp b/source/contacteditor/frmContactEditor-Picture.cpp
index cc29944..fd9d169 100644
--- a/source/contacteditor/frmContactEditor-Picture.cpp
+++ b/source/contacteditor/frmContactEditor-Picture.cpp
@@ -25,12 +25,9 @@ void frmContactEditor::AddPicture( wxCommandEvent& event )
 {
 	
 	// Bring up window for adding a picture.
-	
-	int intResult = 0;
-    
+	    
 	frmContactEditorPicture *frameCEPicture = new frmContactEditorPicture ( this );
 	frameCEPicture->SetEditorMode(FALSE);
-	intResult = GetLastInt(&ContactEditorData.PicturesList);
 	frameCEPicture->SetupPointers(&ContactEditorData.PicturesList,
 		&ContactEditorData.PicturesListAltID,
 		&ContactEditorData.PicturesListPID,
@@ -57,7 +54,7 @@ void frmContactEditor::ModifyPicture( wxCommandEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboPictures,
+	if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures,
 		&longSelected,
                 &intSelectedData)){
 		return;
@@ -91,7 +88,7 @@ void frmContactEditor::DeletePicture( wxCommandEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboPictures,
+	if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures,
 		&longSelected,
                 &intSelectedData)){
 		return;
@@ -120,7 +117,7 @@ void frmContactEditor::LoadPicture( wxListEvent& event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboPictures,
+	if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures,
 		&longSelected,
 		&intSelectedData)){
 		return;
@@ -182,7 +179,7 @@ void frmContactEditor::SavePicture( wxCommandEvent &event )
 	long longSelected = -1;
 	int intSelectedData = 0;
     
-	if (!GetSelectedItem(lboPictures,
+	if (lboPictures->GetItemCount() == 0 || !GetSelectedItem(lboPictures,
                          &longSelected,
                          &intSelectedData)){