summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-06-18 20:27:06 +0200
committerGitHub <noreply@github.com>2018-06-18 20:27:06 +0200
commita9d70598a44e000479d4b2a9347e2b76f35bd9d6 (patch)
tree551303019160b2a6962751afba6144d902520824 /src/map
parentd2c0e453fc95b3f8ce9270e8290d15687e6e3235 (diff)
parent01e7abdf093ae78b6b8b78414b80764cee2c2420 (diff)
downloadhercules-a9d70598a44e000479d4b2a9347e2b76f35bd9d6.tar.gz
hercules-a9d70598a44e000479d4b2a9347e2b76f35bd9d6.tar.bz2
hercules-a9d70598a44e000479d4b2a9347e2b76f35bd9d6.tar.xz
hercules-a9d70598a44e000479d4b2a9347e2b76f35bd9d6.zip
Merge pull request #2071 from Asheraf/expdbfollowup
Fix a crash caused by removing entries in job_db
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c
index bf48d2301..4e2724d61 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -13114,7 +13114,8 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t *
pc->dbs->class_exp_table[idx][CLASS_EXP_TABLE_BASE] = &VECTOR_INDEX(pc->class_exp_groups[CLASS_EXP_TABLE_BASE], i);
}
} else {
- ShowError("status_read_job_db: BaseExpGroup setting not found for entry '%s'\n", name);
+ ShowError("status_read_job_db: BaseExpGroup setting not found for entry '%s', skipping..\n", name);
+ return;
}
/**
@@ -13129,7 +13130,8 @@ void status_read_job_db_sub(int idx, const char *name, struct config_setting_t *
pc->dbs->class_exp_table[idx][CLASS_EXP_TABLE_JOB] = &VECTOR_INDEX(pc->class_exp_groups[CLASS_EXP_TABLE_JOB], i);
}
} else {
- ShowError("status_read_job_db: JobExpGroup setting not found for entry '%s'\n", name);
+ ShowError("status_read_job_db: JobExpGroup setting not found for entry '%s', skipping..\n", name);
+ return;
}
if ((temp = libconfig->setting_get_member(jdb, "Inherit"))) {