asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #88932 from bruvzg/fix_indicatore_destroy

Browse source 
[macOS/Windows] Fix application indicator destruction.
This commit is contained in:
Rémi Verschelde 2024-02-27 21:31:53 +01:00 • committed by GitHub
commit 7682bc3f4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/macos/display_server_macos.mm
View file

@ -4905,7 +4905,7 @@ DisplayServerMacOS::~DisplayServerMacOS() {
} }
// Destroy all status indicators. // Destroy all status indicators.
for (HashMap<IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E;) { for (HashMap<IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E; ++E) {
[[NSStatusBar systemStatusBar] removeStatusItem:E->value.item]; [[NSStatusBar systemStatusBar] removeStatusItem:E->value.item];
} }

2
platform/windows/display_server_windows.cpp
View file

@ -5539,7 +5539,7 @@ DisplayServerWindows::~DisplayServerWindows() {
cursors_cache.clear(); cursors_cache.clear();
// Destroy all status indicators. // Destroy all status indicators.
for (HashMap<IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E;) { for (HashMap<IndicatorID, IndicatorData>::Iterator E = indicators.begin(); E; ++E) {
NOTIFYICONDATAW ndat; NOTIFYICONDATAW ndat;
ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW)); ZeroMemory(&ndat, sizeof(NOTIFYICONDATAW));
ndat.cbSize = sizeof(NOTIFYICONDATAW); ndat.cbSize = sizeof(NOTIFYICONDATAW);