Merge remote-tracking branch 'origin/lm_temporary_path_fix' into dev_native

This commit is contained in:
bubnikv 2018-10-25 09:10:35 +02:00
commit f90795bd55

View file

@ -15,14 +15,16 @@
#include <stdexcept> #include <stdexcept>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/nowide/cstdio.hpp> #include <boost/nowide/cstdio.hpp>
namespace Slic3r { namespace Slic3r {
BackgroundSlicingProcess::BackgroundSlicingProcess() BackgroundSlicingProcess::BackgroundSlicingProcess()
{ {
m_temp_output_path = wxStandardPaths::Get().GetTempDir().utf8_str().data(); boost::filesystem::path temp_path(wxStandardPaths::Get().GetTempDir().utf8_str().data());
m_temp_output_path += (boost::format(".%1%.gcode") % get_current_pid()).str(); temp_path /= (boost::format(".%1%.gcode") % get_current_pid()).str();
m_temp_output_path = temp_path.string();
} }
BackgroundSlicingProcess::~BackgroundSlicingProcess() BackgroundSlicingProcess::~BackgroundSlicingProcess()