From f2b5be54bc5ad3921f731f2b1f4d5d08682aaa9b Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 13 Mar 2019 18:07:30 +0300
Subject: fix for tabSRMM alt+tab icon
---
plugins/TabSRMM/src/container.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'plugins/TabSRMM/src')
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 61cd0cea61..868c5f051f 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -60,6 +60,7 @@ void TContainerData::InitRedraw()
void TContainerData::SetIcon(CTabBaseDlg *pDlg, HICON hIcon)
{
HICON hIconMsg = PluginConfig.g_IconMsgEvent;
+ HICON hIconBig = (pDlg && pDlg->m_cache) ? Skin_LoadProtoIcon(pDlg->m_cache->getProto(), pDlg->m_cache->getStatus(), true) : nullptr;
if (Win7Taskbar->haveLargeIcons()) {
if (hIcon == PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING] || hIcon == hIconMsg) {
@@ -80,7 +81,6 @@ void TContainerData::SetIcon(CTabBaseDlg *pDlg, HICON hIcon)
if (pDlg->m_pContainer->m_dwFlags & CNT_AVATARSONTASKBAR)
pDlg->m_hTaskbarIcon = pDlg->IconFromAvatar();
- HICON hIconBig = (pDlg->m_cache) ? Skin_LoadProtoIcon(pDlg->m_cache->getProto(), pDlg->m_cache->getStatus(), true) : nullptr;
if (pDlg->m_hTaskbarIcon) {
SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)pDlg->m_hTaskbarIcon);
SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
@@ -108,7 +108,6 @@ void TContainerData::SetIcon(CTabBaseDlg *pDlg, HICON hIcon)
return;
}
- HICON hIconBig = nullptr;
if (hIcon == hIconMsg)
hIconBig = Skin_LoadIcon(SKINICON_EVENT_MESSAGE, true);
--
cgit v1.2.3