Fix for a crash issue related to groups that both PEQ and Armm reported on the forums.

This commit is contained in:
SecretsOTheP
2013-03-24 04:01:49 -04:00
parent a6f2c1be8a
commit e609ec1df6
3 changed files with 31 additions and 31 deletions
+5 -2
View File
@@ -192,7 +192,7 @@ bool Client::Process() {
{
GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
LeaveGroup();
@@ -210,6 +210,7 @@ bool Client::Process() {
if (GetMerc())
{
GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
@@ -679,6 +680,7 @@ bool Client::Process() {
if (GetMerc())
{
GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
@@ -728,7 +730,8 @@ bool Client::Process() {
}
if (GetMerc())
{
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
if(GetMerc()->GetGroup() != NULL)
Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
adverrorinfo = 811;