diff --git a/src/client/shader.cpp b/src/client/shader.cpp
index 0b328014a..adbdca372 100644
--- a/src/client/shader.cpp
+++ b/src/client/shader.cpp
@@ -506,7 +506,7 @@ void ShaderSource::rebuildShaders()
 	for (ShaderInfo &i : m_shaderinfo_cache) {
 		ShaderInfo *info = &i;
 		if (!info->name.empty()) {
-			*info = generateShader(info->name, info->material_type, info->drawtype);
+			*info = generateShader(info->name.data(), info->material_type, info->drawtype);
 		}
 	}
 }
diff --git a/src/client/shader.h b/src/client/shader.h
index c78b0078a..5a5023b7d 100644
--- a/src/client/shader.h
+++ b/src/client/shader.h
@@ -29,14 +29,13 @@ std::string getShaderPath(const std::string &name_of_shader,
 		const std::string &filename);
 
 struct ShaderInfo {
-	std::string name = "";
+	std::string_view name = "";
 	video::E_MATERIAL_TYPE base_material = video::EMT_SOLID;
 	video::E_MATERIAL_TYPE material = video::EMT_SOLID;
 	NodeDrawType drawtype = NDT_NORMAL;
 	MaterialType material_type = TILE_MATERIAL_BASIC;
 
-	ShaderInfo() = default;
-	virtual ~ShaderInfo() = default;
+	constexpr ShaderInfo() = default;
 };
 
 /*