minor code cleaning + warning fix

3 files changed, 9 insertions, 9 deletions

diff --git a/protocols/Discord/src/groupchat.cpp b/protocols/Discord/src/groupchat.cpp
index ee00b1054e..fffad8683b 100644
--- a/protocols/Discord/src/groupchat.cpp
+++ b/protocols/Discord/src/groupchat.cpp
@@ -81,7 +81,7 @@ void CDiscordProto::Chat_SendPrivateMessage(GCHOOK *gch)
 
 		setId(hContact, DB_KEY_ID, userId);
 		setId(hContact, DB_KEY_CHANNELID, _wtoi64(gch->si->ptszID));
-		setWString(hContact, "Nick", gch->ptszNick);
+		setWString(hContact, DB_KEY_NICK, gch->ptszNick);
 		Contact_Hide(hContact);
 		db_set_dw(hContact, "Ignore", "Mask1", 0);
 	}
diff --git a/protocols/Discord/src/menus.cpp b/protocols/Discord/src/menus.cpp
index 3cc43fc6ab..59dcc683a5 100644
--- a/protocols/Discord/src/menus.cpp
+++ b/protocols/Discord/src/menus.cpp
@@ -19,16 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 INT_PTR CDiscordProto::OnMenuCopyId(WPARAM hContact, LPARAM)
 {
-	CMStringW mynick(ptrW(getWStringA(hContact, DB_KEY_NICK)));
-	mynick.AppendFormat(L"#%d", getDword(hContact, DB_KEY_DISCR));
-
 	if (OpenClipboard(nullptr)) {
 		EmptyClipboard();
+
+		CMStringW mynick(FORMAT, L"%s#%d", getMStringW(hContact, DB_KEY_NICK).c_str(), getDword(hContact, DB_KEY_DISCR));
 		int length = mynick.GetLength() + 1;
-		HGLOBAL hMemory = GlobalAlloc(GMEM_FIXED, length * sizeof(wchar_t));
-		mir_wstrncpy((wchar_t*)GlobalLock(hMemory), mynick, length);
-		GlobalUnlock(hMemory);
-		SetClipboardData(CF_UNICODETEXT, hMemory);
+		if (HGLOBAL hMemory = GlobalAlloc(GMEM_FIXED, length * sizeof(wchar_t))) {
+			mir_wstrncpy((wchar_t *)GlobalLock(hMemory), mynick, length);
+			GlobalUnlock(hMemory);
+			SetClipboardData(CF_UNICODETEXT, hMemory);
+		}
 		CloseClipboard();
 	}
 
diff --git a/protocols/Discord/src/utils.cpp b/protocols/Discord/src/utils.cpp
index eac8d02a2b..5c4da0c370 100644
--- a/protocols/Discord/src/utils.cpp
+++ b/protocols/Discord/src/utils.cpp
@@ -349,7 +349,7 @@ void CDiscordProto::ParseSpecialChars(SESSION_INFO *si, CMStringW &str)
 		else if (wszWord[0] == '#') {
 			CDiscordUser *pUser = FindUserByChannel(_wtoi64(wszWord.c_str() + 1));
 			if (pUser != nullptr) {
-				ptrW wszNick(getWStringA(pUser->hContact, "Nick"));
+				ptrW wszNick(getWStringA(pUser->hContact, DB_KEY_NICK));
 				if (wszNick != nullptr)
 					str.Replace(L"<" + wszWord + L">", wszNick);
 			}