From 680873487c4a7987012606119a744e5ca725ad30 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 13 Apr 2019 20:22:59 +0300
Subject: merge with trunk

---
 protocols/JabberG/src/jabber_misc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'protocols/JabberG/src/jabber_misc.cpp')

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index 7f6ccc3d53..434394c7da 100755
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -412,7 +412,7 @@ void CJabberProto::InitPopups(void)
 
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Error");
 	mir_snwprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Errors"));
-	ppc.hIcon = LoadIconEx("main");
+	ppc.hIcon = IcoLib_GetIconByHandle(m_hProtoIcon);
 	ppc.colorBack = RGB(191, 0, 0); //Red
 	ppc.colorText = RGB(255, 245, 225); //Yellow
 	ppc.iSeconds = 60;
-- 
cgit v1.2.3