From 7c53b99d310d91088dc3a24beeeb18dd2958955b Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Mon, 6 May 2019 15:23:09 +0400 Subject: [PATCH] Avoid possible data race during access to the static local variable --- components/esmterrain/storage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp index 1e23569b52..ec2699aa79 100644 --- a/components/esmterrain/storage.cpp +++ b/components/esmterrain/storage.cpp @@ -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?