3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/TabSRMM/src/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index d8b62225ac..1b78cfcc8b 100644
--- a/plugins/TabSRMM/src/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -1223,11 +1223,11 @@ TCHAR* UM_FindUserAutoComplete(USERINFO* pUserList, const TCHAR* pszOriginal, co
 
 BOOL UM_RemoveUser(USERINFO** ppUserList, const TCHAR* pszUID)
 {
-	USERINFO *pTemp = *ppUserList, *pLast = NULL;
-
 	if (!ppUserList || !pszUID)
 		return FALSE;
 
+	USERINFO *pTemp = *ppUserList, *pLast = NULL;
+
 	while (pTemp != NULL) {
 		if (!lstrcmpi(pTemp->pszUID, pszUID)) {
 			if (pLast == NULL)
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index ba0501be3f..2019d6a4f5 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -297,7 +297,6 @@ static BOOL DoPopup(SESSION_INFO *si, GCEVENT* gce, TWindowData *dat)
 {
 	int iEvent = gce->pDest->iType;
 	TContainerData *pContainer = dat ? dat->pContainer : NULL;
-	char *szProto = dat ? dat->szProto : si->pszModule;
 
 	TCHAR *bbStart, *bbEnd;
 	if (g_Settings.bBBCodeInPopups) {
@@ -313,6 +312,7 @@ static BOOL DoPopup(SESSION_INFO *si, GCEVENT* gce, TWindowData *dat)
 		* check the status mode against the status mask
 		*/
 
+		char *szProto = dat ? dat->szProto : si->pszModule;
 		if (nen_options.dwStatusMask != -1) {
 			DWORD dwStatus = 0;
 			if (szProto != NULL) {
@@ -505,7 +505,7 @@ void TSAPI DoFlashAndSoundWorker(FLASH_PARAMS* p)
 		}
 
 		if (p->bMustFlash && p->bInactive)
-			UpdateTrayMenu(dat, si->wStatus, si->pszModule, dat ? dat->szStatus : NULL, si->hContact, p->bHighlight ? 1 : 1);
+			UpdateTrayMenu(dat, si->wStatus, si->pszModule, dat->szStatus, si->hContact, p->bHighlight ? 1 : 1);
 	}
 
 	mir_free(p);
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index cf6fb45ae4..531c974e71 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -614,7 +614,7 @@ static int PopupUpdateT(HANDLE hContact, HANDLE hEvent)
 	}
 	i = (available > 0) ? i + 1 : i + 2;
 	for (; i <= pdata->nrMerged; i++)
-		_tcsncat(lpzText, pdata->eventData[i].tszText, MAX_SECONDLINE);
+		_tcsncat(lpzText, pdata->eventData[i].tszText, SIZEOF(lpzText));
 
 	pdata->eventData[pdata->nrMerged].hEvent = hEvent;
 	pdata->eventData[pdata->nrMerged].timestamp = dbe.timestamp;