From 0d2c31d0e4d0881cb4b7ba7bbfc5e80405852145 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Thu, 22 Oct 2020 14:35:20 +0200 Subject: [PATCH] and again a fix on Windows --- src/libslic3r/Thread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp index 72065e8f4..fa7f2e88d 100644 --- a/src/libslic3r/Thread.cpp +++ b/src/libslic3r/Thread.cpp @@ -87,7 +87,7 @@ std::string get_current_thread_name() { wchar_t *ptr = nullptr; ::GetThreadDescription(::GetCurrentThread(), &ptr); - return std::string((ptr == nullptr) ? "" : ptr); + return (ptr == nullptr) ? std::string() : boost::nowide::narrow(ptr); } #else // _WIN32 @@ -133,7 +133,7 @@ void name_tbb_thread_pool_threads() #endif if (nthreads != nthreads_hw) - new tbb::task_scheduler_init(nthreads); + new tbb::task_scheduler_init(nthreads); std::atomic nthreads_running(0); std::condition_variable cv;