summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2019-03-05 22:58:38 +0000
committerGitHub <noreply@github.com>2019-03-05 22:58:38 +0000
commit1c87d57e1d144262419fd534e3dcd391e2e5bcbd (patch)
tree77b88aa41c099a010f6353a41408930bd8f6d9aa
parenta7c5dc50e5445c3aa3b45ea4be48fc179bd4cce8 (diff)
downloadminetest-1c87d57e1d144262419fd534e3dcd391e2e5bcbd.tar.gz
minetest-1c87d57e1d144262419fd534e3dcd391e2e5bcbd.tar.bz2
minetest-1c87d57e1d144262419fd534e3dcd391e2e5bcbd.zip
Change 'num_emerge_threads' default to 1 (#8303)
-rw-r--r--builtin/settingtypes.txt2
-rw-r--r--minetest.conf.example2
-rw-r--r--src/defaultsettings.cpp2
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", "");