mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_async_write_png' into 'master'

Browse Source 
Avoid starting async png writing when overlay image is null (#6638)

Closes #6638

See merge request OpenMW/openmw!1679
This commit is contained in:
uramer 2022-02-19 21:53:22 +00:00
commit 55ff9b0c97
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwrender/globalmap.cpp
View File

@ -635,6 +635,8 @@ namespace MWRender
void GlobalMap::asyncWritePng() void GlobalMap::asyncWritePng()
{ {
if (mOverlayImage == nullptr)
return;
// Use deep copy to avoid any sychronization // Use deep copy to avoid any sychronization
mWritePng = new WritePng(new osg::Image(*mOverlayImage, osg::CopyOp::DEEP_COPY_ALL)); mWritePng = new WritePng(new osg::Image(*mOverlayImage, osg::CopyOp::DEEP_COPY_ALL));
mWorkQueue->addWorkItem(mWritePng, /*front=*/true); mWorkQueue->addWorkItem(mWritePng, /*front=*/true);