From efc92750fa62338e27af41288adc98bad4337271 Mon Sep 17 00:00:00 2001 From: bseiller Date: Thu, 4 Feb 2021 01:10:10 +0100 Subject: [PATCH] Fix crash embark-assistant.cpp: Move call to survey::initiate() after call to survey::setup(), otherwise state won't exist --- plugins/embark-assistant/embark-assistant.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/embark-assistant/embark-assistant.cpp b/plugins/embark-assistant/embark-assistant.cpp index c706c5b4b..61a1b4f83 100644 --- a/plugins/embark-assistant/embark-assistant.cpp +++ b/plugins/embark-assistant/embark-assistant.cpp @@ -285,7 +285,6 @@ command_result embark_assistant(color_ostream &out, std::vector & } embark_assist::main::state = new embark_assist::main::states; - embark_assist::survey::initiate(&embark_assist::main::state->mlt); embark_assist::main::state->match_iterator.active = false; @@ -310,6 +309,7 @@ command_result embark_assistant(color_ostream &out, std::vector & } embark_assist::survey::setup(embark_assist::main::state->max_inorganic); + embark_assist::survey::initiate(&embark_assist::main::state->mlt); embark_assist::matcher::setup(); embark_assist::main::state->geo_summary.resize(world_data->geo_biomes.size()); embark_assist::main::state->survey_results.resize(world->worldgen.worldgen_parms.dim_x);