2
0
Эх сурвалжийг харах

Merge pull request #88932 from bruvzg/fix_indicatore_destroy

[macOS/Windows] Fix application indicator destruction.
Rémi Verschelde 1 жил өмнө
parent
commit
7682bc3f4d

+ 1 - 1
platform/macos/display_server_macos.mm

@@ -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];
 	}
 	}
 
 

+ 1 - 1
platform/windows/display_server_windows.cpp

@@ -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);