openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-21 12:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

add null proptect when destroy

Browse Source 
Signed-off-by: leafly2021 <figo.yefei@huawei.com>
Change-Id: Ib26ebd17f387ff3947cf3b67bbf973f0e0a471e6
This commit is contained in:
leafly2021
2022-05-28 09:15:50 +08:00
parent c0ab6b318e
commit 035f3a21fd
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wm/src/window_impl.cpp
+12
View File
@@ -683,6 +683,9 @@ void WindowImpl::DestroyFloatingWindow()
// remove from appFloatingWindowMap_
for (auto& floatingWindows: appFloatingWindowMap_) {
for (auto iter = floatingWindows.second.begin(); iter != floatingWindows.second.end(); ++iter) {
if ((*iter) == nullptr) {
continue;
}
if ((*iter)->GetWindowId() == GetWindowId()) {
floatingWindows.second.erase(iter);
break;
@@ -693,6 +696,9 @@ void WindowImpl::DestroyFloatingWindow()
// Destroy app floating window if exist
if (appFloatingWindowMap_.count(GetWindowId()) > 0) {
for (auto& floatingWindow : appFloatingWindowMap_.at(GetWindowId())) {
if (floatingWindow == nullptr) {
continue;
}
floatingWindow->Destroy();
}
appFloatingWindowMap_.erase(GetWindowId());
@@ -704,6 +710,9 @@ void WindowImpl::DestroySubWindow()
if (subWindowMap_.count(property_->GetParentId()) > 0) { // remove from subWindowMap_
std::vector<sptr<WindowImpl>>& subWindows = subWindowMap_.at(property_->GetParentId());
for (auto iter = subWindows.begin(); iter < subWindows.end(); ++iter) {
if ((*iter) == nullptr) {
continue;
}
if ((*iter)->GetWindowId() == GetWindowId()) {
subWindows.erase(iter);
break;
@@ -714,6 +723,9 @@ void WindowImpl::DestroySubWindow()
if (subWindowMap_.count(GetWindowId()) > 0) { // remove from subWindowMap_ and windowMap_
std::vector<sptr<WindowImpl>>& subWindows = subWindowMap_.at(GetWindowId());
for (auto& subWindow : subWindows) {
if (subWindow == nullptr) {
continue;
}
subWindow->Destroy(false);
}
subWindowMap_[GetWindowId()].clear();