GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-30 10:04:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

and again a fix on Windows

Browse Source
This commit is contained in:
Vojtech Bubnik 2020-10-22 14:35:20 +02:00
parent 6e2a5419cc
commit 0d2c31d0e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Thread.cpp
View File

@ -87,7 +87,7 @@ std::string get_current_thread_name()
{ {
wchar_t *ptr = nullptr; wchar_t *ptr = nullptr;
::GetThreadDescription(::GetCurrentThread(), &ptr); ::GetThreadDescription(::GetCurrentThread(), &ptr);
return std::string((ptr == nullptr) ? "" : ptr); return (ptr == nullptr) ? std::string() : boost::nowide::narrow(ptr);
} }
#else // _WIN32 #else // _WIN32
@ -133,7 +133,7 @@ void name_tbb_thread_pool_threads()
#endif #endif
if (nthreads != nthreads_hw) if (nthreads != nthreads_hw)
new tbb::task_scheduler_init(nthreads); new tbb::task_scheduler_init(nthreads);
std::atomic<size_t> nthreads_running(0); std::atomic<size_t> nthreads_running(0);
std::condition_variable cv; std::condition_variable cv;