summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-17 15:25:47 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-17 15:25:47 +0000
commit115f98866ceca0b37b9009f6bc1201f873cc5de4 (patch)
treed9ccf1a170af805ece2a2fdbd3a411ee86f2db59
parent81cc0996f38dca205fe283e24d64df6e9cea7c10 (diff)
fix for late icons loading in tabSRMM
git-svn-id: http://svn.miranda-ng.org/main/trunk@7691 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/TabSRMM/src/chat/options.cpp1
-rw-r--r--src/modules/chat/chat_svc.cpp2
-rw-r--r--src/modules/chat/manager.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 6b94c5d6e9..0aa3a65092 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -399,6 +399,7 @@ void Chat_AddIcons(void)
{
Icon_Register(g_hIconDLL, LPGEN("Message Sessions")"/"LPGEN("Group chat windows"), _icons, SIZEOF(_icons));
Icon_Register(g_hIconDLL, LPGEN("Message Sessions")"/"LPGEN("Group chat log"), _logicons, SIZEOF(_logicons));
+ pci->MM_IconsChanged();
}
/*
diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp
index a04bfa861a..514345a7a0 100644
--- a/src/modules/chat/chat_svc.cpp
+++ b/src/modules/chat/chat_svc.cpp
@@ -83,8 +83,6 @@ static int FontsChanged(WPARAM wParam, LPARAM lParam)
static int IconsChanged(WPARAM wParam, LPARAM lParam)
{
- LoadChatIcons();
-
FreeMsgLogBitmaps();
LoadMsgLogBitmaps();
diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp
index 60ceb2181d..ed081db43a 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/modules/chat/manager.cpp
@@ -876,6 +876,8 @@ static MODULEINFO* MM_AddModule(const char *pszModule)
static void MM_IconsChanged(void)
{
+ LoadChatIcons();
+
MODULEINFO *pTemp = m_ModList;
while (pTemp != NULL) {
Safe_DestroyIcon(pTemp->hOnlineIcon);