Change 'num_emerge_threads' default to 1 (#8303)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index da9b8bf10e711cbf8950634fda85c01da027380b..3df0376a3305604b3306e8b0cae013e88238604a 100644 (file)
--- 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 f31d9356aa8da58161865133be76d46c19df68eb..6e40a4b6bdb92caaad7182d1b93963a2706ea684 100644 (file)
--- 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 1df6dccb62460623da5ba27538b1ae853c76566f..5a56f3d770d4b101a1ced012ec5b11373405d9c0 100644 (file)
--- 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", "");