From c6246fb4b0d0d29d34082fe802b1cf2c8f970937 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 2 Feb 2019 16:19:23 +0300 Subject: Add missing check in run_script_main Signed-off-by: Haru --- src/map/script.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/map/script.c b/src/map/script.c index 25bf59839..ccd5eedcc 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4621,6 +4621,9 @@ static void run_script_main(struct script_state *st) nullpo_retv(st); script->attach_state(st); + if (st->state != END && Assert_chk(st->state == RUN || st->state == STOP || st->state == RERUNLINE)) { + st->state = END; + } nd = map->id2nd(st->oid); if( nd && nd->bl.m >= 0 ) -- cgit v1.2.3-70-g09d2 From 59f052f990945564d2fe4356817f1894d55b9719 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 4 Feb 2019 23:12:41 +0100 Subject: Release v2018.12.16+1 Signed-off-by: Haru --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1be687911..73f64f0e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and this project does not adhere to [Semantic Versioning](http://semver.org/spec If you are reading this in a text editor, simply ignore this section --> +## [v2018.12.16+1] `December 16 2018` `PATCH 1` + +### Fixed + +- Added a missing check in `run_script_main()`. (#2362) + ## [v2018.12.16] `December 16 2018` ### Added @@ -561,6 +567,7 @@ If you are reading this in a text editor, simply ignore this section - New versioning scheme and project changelogs/release notes (#1853) [Unreleased]: https://github.com/HerculesWS/Hercules/compare/stable...master +[v2018.12.16+1]: https://github.com/HerculesWS/Hercules/compare/v2018.12.16...v2018.12.16+1 [v2018.12.16]: https://github.com/HerculesWS/Hercules/compare/v2018.11.18+1...v2018.12.16 [v2018.11.18+1]: https://github.com/HerculesWS/Hercules/compare/v2018.11.18...v2018.11.18+1 [v2018.11.18]: https://github.com/HerculesWS/Hercules/compare/v2018.10.21...v2018.11.18 -- cgit v1.2.3-70-g09d2