From: Andreas Maier <staubim@quantentunnel.de>
Date: Tue, 18 Jun 2019 20:40:27 +0000 (+0200)
Subject: [EXPLORER] Properly initialise tbBtn.iBitmap. CORE-14262.
X-Git-Tag: 0.4.14-dev~745
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=8d6c9e844c9b5e8a33344c9768e0d2fa305445c5

[EXPLORER] Properly initialise tbBtn.iBitmap. CORE-14262.

In CNotifyToolbar::AddButton tbBtn.iBitmap (imagelist-index)
was inialised with 0. Tigthvnc adds the icon wihtout NIF_ICON flag.
So the wrong icon index was kept and later replaced.
---

diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp
index 21869331509..8d4f9145ce5 100644
--- a/base/shell/explorer/syspager.cpp
+++ b/base/shell/explorer/syspager.cpp
@@ -742,6 +742,7 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData)
     tbBtn.dwData = (DWORD_PTR)notifyItem;
     tbBtn.iString = (INT_PTR) text;
     tbBtn.idCommand = GetButtonCount();
+    tbBtn.iBitmap = -1;
 
     if (iconData->uFlags & NIF_STATE)
     {