From 9a861161c1fc6efa2145430991f75804fb5fd540 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 22 Jun 2014 17:59:09 +0000
Subject: message sending fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@9554 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/contactcache.cpp | 6 ++----
 plugins/TabSRMM/src/mim.cpp          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index e34eb7b821..a9d817c2e2 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -150,7 +150,7 @@ bool CContactCache::updateStatus()
  */
 void CContactCache::updateMeta(bool fForce)
 {
-	m_szMetaProto = (m_Valid) ? GetContactProto(db_mc_getMostOnline(cc->contactID)) : NULL;
+	m_szMetaProto = (m_Valid) ? GetContactProto(db_mc_getSrmmSub(cc->contactID)) : NULL;
 }
 
 /**
@@ -602,7 +602,5 @@ int CContactCache::getMaxMessageLength()
 
 const MCONTACT CContactCache::getActiveContact() const
 {
-	if (!m_isMeta)
-		return m_hContact;
-	return CallService(MS_MC_GETSRMMSUB, m_hContact, 0);
+	return (m_isMeta) ? m_hContact : db_mc_getSrmmSub(m_hContact);
 }
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 21e412c172..218fc6031b 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -592,7 +592,7 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	else {
 		char *szProto = GetContactProto(hContact);
 		if (szProto && !strcmp(szProto, META_PROTO))
-			szProto = GetContactProto(db_mc_getMostOnline(hContact));
+			szProto = GetContactProto(db_mc_getSrmmSub(hContact));
 
 		if (szProto) {
 			DWORD dwStatus = (DWORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0);
-- 
cgit v1.2.3