mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-23 19:20:56 +00:00
Code Issues Projects Releases Wiki Activity

Avoid possible data race during access to the static local variable

Browse Source
This commit is contained in:
Andrei Kortunov 2019-05-06 15:23:09 +04:00
parent 7c46102f0c
commit 7c53b99d31
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esmterrain/storage.cpp
View File

@ -353,11 +353,11 @@ namespace ESMTerrain
std::string Storage::getTextureName(UniqueTextureId id)
{
// Goes under used terrain blend transitions
static const std::string baseTexture = "textures\\tx_black_01.dds";
static constexpr char baseTexture[] = "textures\\tx_black_01.dds";
if (id.first == -1)
return baseTexture;
static const std::string defaultTexture = "textures\\_land_default.dds";
static constexpr char defaultTexture[] = "textures\\_land_default.dds";
if (id.first == 0)
return defaultTexture; // Not sure if the default texture really is hardcoded?