summaryrefslogtreecommitdiff
path: root/src/gui/minimap.cpp
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-02-15 19:20:10 -0500
committerChuck Miller <shadowmil@gmail.com>2010-02-15 20:37:43 -0500
commit432d16435774cafd630e287321e882f3e8510d16 (patch)
treefa48274ac755370ee0673cbdba781e8c0bcddf2b /src/gui/minimap.cpp
parenta23c5ae43ceb1c2ee9bd6b86c29f4b7ffb772743 (diff)
downloadmana-client-432d16435774cafd630e287321e882f3e8510d16.tar.gz
mana-client-432d16435774cafd630e287321e882f3e8510d16.tar.bz2
mana-client-432d16435774cafd630e287321e882f3e8510d16.tar.xz
mana-client-432d16435774cafd630e287321e882f3e8510d16.zip
Revert "Attempt to fix Minimap caption again..."
This reverts commit 20d2a17c8c0fa9220c257d61641a6459e154de26. Going to try to remove this fix, people have still been reporting crashes with minimap caption. Maybe if more people report it, we can get more information.
Diffstat (limited to 'src/gui/minimap.cpp')
-rw-r--r--src/gui/minimap.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 7904d4fa..59513323 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -77,9 +77,12 @@ Minimap::~Minimap()
void Minimap::setMap(Map *map)
{
// Set the title for the Minimap
- std::string caption = map ? map->getName() : "";
+ std::string caption = "";
std::string minimapName;
+ if (map)
+ caption = map->getName();
+
if (caption.empty())
caption = _("Map");