From e4df28b4a013cc44febf9ee9075c7601d8ed857d Mon Sep 17 00:00:00 2001
From: ElzorFox <elzorfox@ya.ru>
Date: Tue, 16 Oct 2018 11:11:20 +0500
Subject: dbx_mdbx: fix return value for db_event_edit mir_app: fix adding
 messages with IDs that were deleted earlier

---
 src/mir_app/src/proto_utils.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp
index a82f92eb78..4f3c2a0206 100644
--- a/src/mir_app/src/proto_utils.cpp
+++ b/src/mir_app/src/proto_utils.cpp
@@ -517,12 +517,11 @@ MEVENT PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
 	// if it's possible to find an existing event by its id, do that
 	if ((GetCaps(PFLAGNUM_4) & PF4_SERVERMSGID) && pre->szMsgId != nullptr) {
 		MEVENT hDbEvent = db_event_getById(m_szModuleName, pre->szMsgId);
-		if (hDbEvent == 0) {
+		if (hDbEvent == 0 || db_event_edit(hContact, hDbEvent, &dbei)) {
 			hDbEvent = db_event_add(hContact, &dbei);
 			if (hDbEvent)
 				db_event_setId(m_szModuleName, hDbEvent, pre->szMsgId);
 		}
-		else db_event_edit(hContact, hDbEvent, &dbei);
 
 		return hDbEvent;
 	}
-- 
cgit v1.2.3