DBEVENTINFO::hContact to be returned inside an event, no need to call db_event_getContact() just after db_event_get()

2 files changed, 2 insertions, 2 deletions

diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp
index 356d7ad6f0..78815ef42b 100644
--- a/src/core/stdmsg/src/cmdlist.cpp
+++ b/src/core/stdmsg/src/cmdlist.cpp
@@ -95,7 +95,7 @@ void msgQueue_processack(MCONTACT hContact, int id, BOOL success, LPARAM lParam)
 	dbei.szModule = Proto_GetBaseAccountName(hContact);

 	dbei.timestamp = time(0);

 	dbei.cbBlob = (uint32_t)(mir_strlen(p->szMsg) + 1);

-	dbei.pBlob = (uint8_t*)p->szMsg;

+	dbei.pBlob = p->szMsg;

 	dbei.szId = (char *)lParam;

 

 	MessageWindowEvent evt = { id, hContact, &dbei };

diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index 2e59abcf9e..c886b4f341 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -303,7 +303,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 			int newBlobSize = db_event_getBlobSize(hDbEvent);

 			if (newBlobSize > oldBlobSize) {

-				dbei.pBlob = (uint8_t*)mir_realloc(dbei.pBlob, newBlobSize);

+				dbei.pBlob = (char *)mir_realloc(dbei.pBlob, newBlobSize);

 				oldBlobSize = newBlobSize;

 			}

 			dbei.cbBlob = oldBlobSize;