aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2013-09-07 05:07:28 -0700
committerMachiavelli <machiavelli.trinity@gmail.com>2013-09-07 05:07:28 -0700
commit287dc307bc28cb2c759e7fa4d92b55c030408aae (patch)
treedc153bfe43ac8a5b880c354b93950fcc70a90745 /src/server/scripts/Commands
parentc3c5327fbddc0a742325337bd667bcc81fd8f8ae (diff)
parent9ce70fb3c945e7c10c63d78d18e479a1c11b6211 (diff)
Merge pull request #10724 from jackpoz/guild_disband_leak
Core/Guild: Fix memory leak on Guild disband
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_guild.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
index 0af0da10846..040c68dbacb 100644
--- a/src/server/scripts/Commands/cs_guild.cpp
+++ b/src/server/scripts/Commands/cs_guild.cpp
@@ -118,6 +118,7 @@ public:
return false;
targetGuild->Disband();
+ delete targetGuild;
return true;
}
@@ -164,7 +165,7 @@ public:
if (!targetGuild)
return false;
- targetGuild->DeleteMember(targetGuid, false, true);
+ targetGuild->DeleteMember(targetGuid, false, true, true);
return true;
}