diff options
| author | Kenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com> | 2020-05-05 01:00:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 01:00:27 +0200 |
| commit | 66607bfbfe197a5fec86dd1efe34a2da80929648 (patch) | |
| tree | ed0e97ddc134c82067a436ea3ffd67f2f46be60b /src/common/core.c | |
| parent | 3f6b7497531f9ace331ca74d271898e938245c04 (diff) | |
| parent | 944d8489f1bcca93e6b2ff06a159084f064dce12 (diff) | |
| download | hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.tar.gz hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.tar.bz2 hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.tar.xz hercules-66607bfbfe197a5fec86dd1efe34a2da80929648.zip | |
Merge branch 'master' into configure_newopt
Diffstat (limited to 'src/common/core.c')
| -rw-r--r-- | src/common/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/core.c b/src/common/core.c index dbd1d2596..5be90a411 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -2,8 +2,8 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2018 Hercules Dev Team - * Copyright (C) Athena Dev Teams + * Copyright (C) 2012-2020 Hercules Dev Team + * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -489,6 +489,7 @@ int main(int argc, char **argv) iMalloc->init();// needed for Show* in display_title() [FlavioJS] showmsg->init(); + nullpo->init(); cmdline->init(); @@ -552,6 +553,7 @@ int main(int argc, char **argv) cmdline->final(); //sysinfo->final(); Called by iMalloc->final() + nullpo->final(); iMalloc->final(); showmsg->final(); // Should be after iMalloc->final() |