summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/guild.cpp1
-rw-r--r--src/main.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/guild.cpp b/src/guild.cpp
index 21c066070..c7a9c0cdc 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -184,6 +184,7 @@ void Guild::removeMember(const std::string &name)
itr_end = mMembers.end();
while (deleted)
{
+ deleted = false;
while (itr != itr_end)
{
if ((*itr)->getName() == name)
diff --git a/src/main.cpp b/src/main.cpp
index beb23a72c..a170cf513 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -196,7 +196,7 @@ static void initInternationalization()
// mingw doesn't like LOCALEDIR to be defined for some reason
bindtextdomain("manaplus", "translations/");
#else
-#if ENABLE_PORTABLE
+#ifdef ENABLE_PORTABLE
bindtextdomain("manaplus", (std::string(PHYSFS_getBaseDir())
+ "../locale/").c_str());
#else