Change 'num_emerge_threads' default to 1 (#8303)

paramat · web-flow · commit 1c87d57e1d14 · 2019-03-05T22:58:38.000Z
diff --git 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
@@ -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
@@ -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", "");

Original file line number	Diff line number	Diff line change
`@@ -3005,7 +3005,7 @@`
`3005`	`3005`	`# 'on_generated'.`
`3006`	`3006`	`# For many users the optimum setting may be '1'.`
`3007`	`3007`	`# type: int`
`3008`		`-# num_emerge_threads = 0`
	`3008`	`+# num_emerge_threads = 1`
`3009`	`3009`
`3010`	`3010`	`#`
`3011`	`3011`	`# Online Content Repository`