From a61f28f670288dfae066c5220a98204e0692ead6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 2 Aug 2014 17:04:47 +0000
Subject: git-svn-id: http://svn.miranda-ng.org/main/trunk@10026
 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

---
 plugins/TabSRMM/src/container.cpp | 3 +--
 plugins/TabSRMM/src/globals.cpp   | 4 +++-
 plugins/TabSRMM/src/msgdialog.cpp | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index efe384d9fb..6eb56bf111 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1131,7 +1131,6 @@ panel_found:
 	case DM_UPDATETITLE:
 		{
 			MCONTACT hContact = 0;
-			const TCHAR *szNewTitle = NULL;
 			TWindowData *dat = NULL;
 
 			if (lParam) {               // lParam != 0 means sent by a chat window
@@ -1166,7 +1165,7 @@ panel_found:
 			}
 			if (dat) {
 				SendMessage(hwndDlg, DM_SETICON, (WPARAM)dat, (LPARAM)(dat->hXStatusIcon ? dat->hXStatusIcon : dat->hTabStatusIcon));
-				szNewTitle = Utils::FormatTitleBar(dat, pContainer->settings->szTitleFormat);
+				const TCHAR *szNewTitle = Utils::FormatTitleBar(dat, pContainer->settings->szTitleFormat);
 				if (szNewTitle) {
 					SetWindowText(hwndDlg, szNewTitle);
 					mir_free((void*)szNewTitle);
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 718b289fe3..eeef4a4f38 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -433,8 +433,10 @@ int CGlobals::DBSettingChanged(WPARAM hContact, LPARAM lParam)
 		}
 		if (lstrlenA(setting) > 6 && lstrlenA(setting) < 9 && !strncmp(setting, "Status", 6)) {
 			fChanged = true;
-			if (c)
+			if (c) {
 				c->updateMeta();
+				c->updateUIN();
+			}
 		}
 		else if (!strcmp(setting, "MirVer"))
 			PostMessage(hwnd, DM_CLIENTCHANGED, 0, 0);
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 467d2990dc..6499e89f8d 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1228,8 +1228,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			dat->bIsMeta = dat->cache->isMeta();
 			if (dat->bIsMeta)
 				dat->cache->updateMeta();
-			else
-				dat->cache->updateUIN();
+
+			dat->cache->updateUIN();
 
 			if (dat->hContact && dat->szProto != NULL) {
 				dat->wStatus = db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);
-- 
cgit v1.2.3