Skip to content

Commit 8c717d0

Browse files
andy-123JoachimHenze
authored andcommitted
[0.4.12][EXPLORER] Properly initialize tbBtn.iBitmap. CORE-14262 PR#1667
In CNotifyToolbar::AddButton tbBtn.iBitmap (imagelist-index) was initialized with 0. TightVNC adds the icon without NIF_ICON flag. So the wrong icon index was kept and later replaced. This fixes an old regression visible since SVN r68893 cherry picked from commit 0.4.13-dev-481-g 8d6c9e8
1 parent c6aa07f commit 8c717d0

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

base/shell/explorer/syspager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData)
737737
tbBtn.dwData = (DWORD_PTR)notifyItem;
738738
tbBtn.iString = (INT_PTR) text;
739739
tbBtn.idCommand = GetButtonCount();
740+
tbBtn.iBitmap = -1;
740741

741742
if (iconData->uFlags & NIF_STATE)
742743
{

0 commit comments

Comments
 (0)