diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-14 20:38:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-14 20:38:05 +0000 |
| commit | b23ed923d6cac195897244661f26aa3976bb650f (patch) | |
| tree | e2fb670d77228a657f439f8a12abc2475399bf03 /src/core/stdmsg | |
| parent | 60adc0705ec417756a3e86d436ad21b5265a1da2 (diff) | |
fix of sending messages to subs in stdchat & scriver
git-svn-id: http://svn.miranda-ng.org/main/trunk@8605 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdmsg')
| -rw-r--r-- | src/core/stdmsg/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | src/core/stdmsg/src/globals.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/stdmsg/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h index 68c2d753a0..97f5d26b89 100644 --- a/src/core/stdmsg/src/commonheaders.h +++ b/src/core/stdmsg/src/commonheaders.h @@ -65,6 +65,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_fontservice.h>
#include <m_timezones.h>
#include <m_avatars.h>
+#include <m_metacontacts.h>
#include "cmdlist.h"
#include "msgs.h"
diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index eb63672e11..56be8b56c1 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -133,7 +133,11 @@ static int ackevent(WPARAM wParam, LPARAM lParam) {
ACKDATA *pAck = (ACKDATA *)lParam;
if (pAck && pAck->type == ACKTYPE_MESSAGE) {
- msgQueue_processack(pAck->hContact, (int)pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam);
+ MCONTACT hContact = db_mc_getMeta(pAck->hContact);
+ if (hContact == NULL)
+ hContact = pAck->hContact;
+
+ msgQueue_processack(hContact, (int)pAck->hProcess, pAck->result == ACKRESULT_SUCCESS, (char*)pAck->lParam);
if (pAck->result == ACKRESULT_SUCCESS)
SkinPlaySound("SendMsg");
|