From 82739f4d7d634eaccdc8414382da5d55ae39734d Mon Sep 17 00:00:00 2001 From: Paramat Date: Tue, 5 Mar 2019 22:58:38 +0000 Subject: [PATCH] Change 'num_emerge_threads' default to 1 (#8303) --- builtin/settingtypes.txt | 2 +- minetest.conf.example | 2 +- src/defaultsettings.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index da9b8bf10..3df0376a3 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1925,7 +1925,7 @@ emergequeue_limit_generate (Limit of emerge queues to generate) int 64 # processes, especially in singleplayer and/or when running Lua code in # 'on_generated'. # For many users the optimum setting may be '1'. -num_emerge_threads (Number of emerge threads) int 0 +num_emerge_threads (Number of emerge threads) int 1 [Online Content Repository] diff --git a/minetest.conf.example b/minetest.conf.example index f31d9356a..6e40a4b6b 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -3005,7 +3005,7 @@ # 'on_generated'. # For many users the optimum setting may be '1'. # type: int -# num_emerge_threads = 0 +# num_emerge_threads = 1 # # Online Content Repository diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 1df6dccb6..5a56f3d77 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -374,7 +374,7 @@ void set_default_settings(Settings *settings) settings->setDefault("emergequeue_limit_total", "512"); settings->setDefault("emergequeue_limit_diskonly", "64"); settings->setDefault("emergequeue_limit_generate", "64"); - settings->setDefault("num_emerge_threads", "0"); + settings->setDefault("num_emerge_threads", "1"); settings->setDefault("secure.enable_security", "true"); settings->setDefault("secure.trusted_mods", ""); settings->setDefault("secure.http_mods", "");