diff options
author | kwolekr <mirrorisim@gmail.com> | 2013-02-23 22:06:16 -0500 |
---|---|---|
committer | kwolekr <mirrorisim@gmail.com> | 2013-02-25 23:11:00 -0500 |
commit | f00d136ab1523297fdf4707bbc5d40ec9d4f7afb (patch) | |
tree | e6e79c95fe11613e711301aa914dd0bda8885504 /src/emerge.cpp | |
parent | 28c50c16cdeda7de39ed15c17094f3de01287d4c (diff) | |
download | minetest-f00d136ab1523297fdf4707bbc5d40ec9d4f7afb.tar.gz minetest-f00d136ab1523297fdf4707bbc5d40ec9d4f7afb.tar.bz2 minetest-f00d136ab1523297fdf4707bbc5d40ec9d4f7afb.zip |
Fix selection of # threads, set default to 1 thread
Diffstat (limited to 'src/emerge.cpp')
-rw-r--r-- | src/emerge.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index dd97734c5..dc2bb3e99 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -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"); } |