Merge branch 'master' into topic/vern/script-inlining

This commit is contained in:
Jon Siwek 2021-01-06 22:08:29 -08:00
commit 64631a2d9f
58 changed files with 1151 additions and 326 deletions

View file

@ -918,9 +918,9 @@ SetupResult setup(int argc, char** argv, Options* zopts)
return {0, std::move(options)};
}
int cleanup(bool did_net_run)
int cleanup(bool did_run_loop )
{
if ( did_net_run )
if ( did_run_loop )
done_with_network();
run_state::detail::delete_run();