Fix properties bug.

Fix Random crushes and valgrind memory errors.

Reviewed-by: thorbjorn

3 files changed, 5 insertions, 5 deletions

diff --git a/src/map.cpp b/src/map.cpp
index b1bd634b..9f0a901b 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -564,12 +564,12 @@ void Map::removeSprite(MapSprite iterator)
     mSprites.erase(iterator);
 }
 
-const std::string &Map::getMusicFile() const
+const std::string Map::getMusicFile() const
 {
     return getProperty("music");
 }
 
-const std::string &Map::getName() const
+const std::string Map::getName() const
 {
     if (hasProperty("name"))
         return getProperty("name");
diff --git a/src/map.h b/src/map.h
index 9d5fe021..7b91b6bb 100644
--- a/src/map.h
+++ b/src/map.h
@@ -263,8 +263,8 @@ class Map : public Properties
         int getTileHeight() const
         { return mTileHeight; }
 
-        const std::string &getMusicFile() const;
-        const std::string &getName() const;
+        const std::string getMusicFile() const;
+        const std::string getName() const;
 
         /**
          * Gives the map id based on filepath (ex: 009-1)
diff --git a/src/properties.h b/src/properties.h
index 18eafc6b..1320b0c9 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -45,7 +45,7 @@ class Properties
          * @return the value of the given property or the given default when it
          *         doesn't exist.
          */
-        const std::string &getProperty(const std::string &name,
+        const std::string getProperty(const std::string &name,
                                        const std::string &def = "") const
         {
             PropertyMap::const_iterator i = mProperties.find(name);