Skip to content
Snippets Groups Projects
Commit f00d136a authored by kwolekr's avatar kwolekr
Browse files

Fix selection of # threads, set default to 1 thread

parent 28c50c16
No related branches found
No related tags found
No related merge requests found
......@@ -187,7 +187,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("emergequeue_limit_total", "256");
settings->setDefault("emergequeue_limit_diskonly", "");
settings->setDefault("emergequeue_limit_generate", "");
settings->setDefault("num_emerge_threads", "");
settings->setDefault("num_emerge_threads", "1");
// physics stuff
settings->setDefault("movement_acceleration_default", "3");
......
......@@ -56,8 +56,7 @@ EmergeManager::EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef) {
if (g_settings->get("num_emerge_threads").empty()) {
int nprocs = porting::getNumberOfProcessors();
// leave a proc for the main thread and one for some other misc threads
if (nprocs > 2)
nthreads = nprocs - 2;
nthreads = (nprocs > 2) ? nthreads = nprocs - 2 : 1;
} else {
nthreads = g_settings->getU16("num_emerge_threads");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment