summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-09-23 16:42:22 +0200
committerGitHub <noreply@github.com>2018-09-23 16:42:22 +0200
commitfadc4ecbba8ac97af8be9f84c732e47c1629e30b (patch)
tree0e315f20c7930160e9a8a032ff8e85fded487f8e /src
parent98e2ef2db8f49daa2e1232589b960d9376b9a9c6 (diff)
parent1c2e90a46f6b3449dd83fab490cfcb747d3b3356 (diff)
downloadhercules-fadc4ecbba8ac97af8be9f84c732e47c1629e30b.tar.gz
hercules-fadc4ecbba8ac97af8be9f84c732e47c1629e30b.tar.bz2
hercules-fadc4ecbba8ac97af8be9f84c732e47c1629e30b.tar.xz
hercules-fadc4ecbba8ac97af8be9f84c732e47c1629e30b.zip
Merge pull request #2209 from dastgirp/issue/2173
Fixes #2173
Diffstat (limited to 'src')
-rw-r--r--src/char/int_guild.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index e03278fad..56e1c1ba3 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -443,7 +443,9 @@ static struct guild *inter_guild_fromsql(int guild_id)
if( m->position >= MAX_GUILDPOSITION ) // Fix reduction of MAX_GUILDPOSITION [PoW]
m->position = MAX_GUILDPOSITION - 1;
SQL->GetData(inter->sql_handle, 11, &data, &len); memcpy(m->name, data, min(len, NAME_LENGTH));
- SQL->GetData(inter->sql_handle, 12, &data, NULL); m->last_login = atoi(data);
+ SQL->GetData(inter->sql_handle, 12, &data, NULL);
+ if (data != NULL)
+ m->last_login = atoi(data);
m->modified = GS_MEMBER_UNMODIFIED;
}