modified: utilities.cpp

1 files changed, 7 insertions, 3 deletions

diff --git a/utilities.cpp b/utilities.cpp
index b066e22..83e13da 100755
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -446,10 +446,14 @@ int onProtoAck(WPARAM w, LPARAM l)
 	else if(ack->type == ACKTYPE_MESSAGE && ack->result == ACKRESULT_FAILED)
 	{
 		extern std::list<HANDLE> sent_msgs;
-		std::list<HANDLE>::iterator it = std::find(sent_msgs.begin(), sent_msgs.end(), ack->hProcess);
-		if(it != sent_msgs.end())
+		if(!sent_msgs.empty())
 		{
-			HistoryLog(ack->hContact, db_event("Failed to send encrypted message", 0,0, 0));
+			std::list<HANDLE>::iterator it = std::find(sent_msgs.begin(), sent_msgs.end(), ack->hProcess);
+			if(it != sent_msgs.end())
+			{
+				HistoryLog(ack->hContact, db_event("Failed to send encrypted message", 0,0, 0));
+				sent_msgs.erase(it);
+			}
 		}
 	}
 	return 0;