mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix 4ffc005a7f

Browse Source 
A GUI sprite can have e.g. "color:" and "stretched:", but 'sprite' was
moved from after the first call.
Refs #6206

Differential Revision: https://code.wildfiregames.com/D4094
This was SVN commit r25698.
This commit is contained in:
wraitii
2021-06-06 07:44:20 +00:00
parent 73dcf36976
commit ddbf1ea770
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/GUIRenderer.cpp
+3 -8
View File
@@ -111,7 +111,6 @@ void GUIRenderer::UpdateDrawCallCache(const CGUI& pGUI, DrawCalls& Calls, const
} }
sprite->AddImage(std::move(image)); sprite->AddImage(std::move(image));
Sprites[SpriteName] = std::move(sprite);
} }
else if (SpriteName.Find("cropped:") != -1) else if (SpriteName.Find("cropped:") != -1)
{ {
@@ -136,7 +135,6 @@ void GUIRenderer::UpdateDrawCallCache(const CGUI& pGUI, DrawCalls& Calls, const
} }
sprite->AddImage(std::move(image)); sprite->AddImage(std::move(image));
Sprites[SpriteName] = std::move(sprite);
} }
if (SpriteName.Find("color:") != -1) if (SpriteName.Find("color:") != -1)
{ {
@@ -165,17 +163,14 @@ void GUIRenderer::UpdateDrawCallCache(const CGUI& pGUI, DrawCalls& Calls, const
} }
sprite->AddImage(std::move(image)); sprite->AddImage(std::move(image));
Sprites[SpriteName] = std::move(sprite);
} }
it = Sprites.find(SpriteName); if (sprite->m_Images.empty())
// Otherwise, just complain and give up:
if (it == Sprites.end())
{ {
sprite.reset();
LOGERROR("Trying to use a sprite that doesn't exist (\"%s\").", SpriteName.c_str()); LOGERROR("Trying to use a sprite that doesn't exist (\"%s\").", SpriteName.c_str());
return; return;
} }
else
it = Sprites.insert_or_assign(SpriteName, std::move(sprite)).first;
} }
Calls.reserve(it->second->m_Images.size()); Calls.reserve(it->second->m_Images.size());