fix use after free

2 files changed, 4 insertions, 2 deletions

diff --git a/src/tile-atlas.cpp b/src/tile-atlas.cpp
index 11c3e6ae..7960c859 100644
--- a/src/tile-atlas.cpp
+++ b/src/tile-atlas.cpp
@@ -1,8 +1,9 @@
+
 #include "tile-atlas.hpp"
 #include "compat/assert.hpp"
 #include "tile-image.hpp"
 #include <limits>
-#include <Corrade/Containers/StringView.h>
+#include <Corrade/Containers/StringStl.h>
 #include <Magnum/Math/Color.h>
 #include <Magnum/ImageView.h>
 #include <Magnum/GL/TextureFormat.h>
diff --git a/src/tile-atlas.hpp b/src/tile-atlas.hpp
index 026d2073..5856f3bb 100644
--- a/src/tile-atlas.hpp
+++ b/src/tile-atlas.hpp
@@ -3,6 +3,7 @@
 #include <Magnum/Magnum.h>
 #include <Magnum/GL/Texture.h>
 #include <array>
+#include <string>
 #include <memory>
 
 namespace floormat {
@@ -31,7 +32,7 @@ private:
 
     std::unique_ptr<const texcoords[]> texcoords_;
     GL::Texture2D tex_;
-    String name_;
+    std::string name_;
     Vector2ui size_;
     Vector2ub dims_;
 };