Skip to content

fix: value-initialize NOTIFYICONDATA and clear hIcon after destroy #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JulianPscheid wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: value-initialize NOTIFYICONDATA and clear hIcon after destroy #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/tray_manager/windows/tray_manager_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class TrayManagerPlugin : public flutter::Plugin {
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> g_converter;

flutter::PluginRegistrarWindows* registrar;
NOTIFYICONDATA nid;
NOTIFYICONIDENTIFIER niif;
NOTIFYICONDATA nid{};
NOTIFYICONIDENTIFIER niif{};
// do create pop-up menu only once.
HMENU hMenu = CreatePopupMenu();
bool tray_icon_setted = false;
Expand Down Expand Up @@ -186,7 +186,10 @@ std::optional<LRESULT> TrayManagerPlugin::HandleWindowProc(HWND hWnd,
if (message == WM_DESTROY) {
if (tray_icon_setted) {
Shell_NotifyIcon(NIM_DELETE, &nid);
DestroyIcon(nid.hIcon);
if (nid.hIcon != nullptr) {
DestroyIcon(nid.hIcon);
nid.hIcon = nullptr;
}
}
} else if (message == WM_COMMAND) {
flutter::EncodableMap eventData = flutter::EncodableMap();
Expand Down Expand Up @@ -241,7 +244,10 @@ void TrayManagerPlugin::Destroy(
const flutter::MethodCall<flutter::EncodableValue>& method_call,
std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
Shell_NotifyIcon(NIM_DELETE, &nid);
DestroyIcon(nid.hIcon);
if (nid.hIcon != nullptr) {
DestroyIcon(nid.hIcon);
nid.hIcon = nullptr;
}
tray_icon_setted = false;

result->Success(flutter::EncodableValue(true));
Expand Down