openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

!358 fix window snapshot nullptr bug

Browse Source 
Merge pull request !358 from Klaus_q/master_wq
This commit is contained in:
openharmony_ci
2022-02-25 23:53:40 +00:00
committed by Gitee
parent e20f415a61 370a879146
commit bbfba21c7e
15 changed files with 80 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dmserver/src/abstract_screen_controller.cpp
+7
View File
@@ -159,6 +159,7 @@ ScreenId AbstractScreenController::GetDefaultAbstractScreenId()
auto iter = rs2DmsScreenIdMap_.find(rsDefaultId);
if (iter != rs2DmsScreenIdMap_.end()) {
WLOGI("GetDefaultAbstractScreenId, screen:%{public}" PRIu64"", iter->second);
defaultScreenId = iter->second;
return iter->second;
}
WLOGFI("GetDefaultAbstractScreenId, default screen is null, try to get.");
@@ -172,9 +173,15 @@ ScreenId AbstractScreenController::GetDefaultAbstractScreenId()
dms2RsScreenIdMap_.insert(std::make_pair(dmsScreenId, rsDefaultId));
dmsScreenMap_.insert(std::make_pair(dmsScreenId, absScreen));
dmsScreenCount_++;
defaultScreenId = dmsScreenId;
return dmsScreenId;
}
ScreenId AbstractScreenController::GetDefaultScreenId() const
{
return defaultScreenId;
}
ScreenId AbstractScreenController::ConvertToRsScreenId(ScreenId dmsScreenId)
{
std::lock_guard<std::recursive_mutex> lock(mutex_);