amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'vb_gcodeviewer_menu'

Browse source
This commit is contained in:
Vojtech Bubnik 2020-09-08 13:51:02 +02:00
commit 4e4b8ff5aa
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/Utils/Process.cpp
View file

@ -18,6 +18,10 @@
// Fails to compile on Windows on the build server. // Fails to compile on Windows on the build server.
#ifdef __APPLE__ #ifdef __APPLE__
#include <boost/process/spawn.hpp> #include <boost/process/spawn.hpp>
<<<<<<< HEAD
=======
#include <boost/process/args.hpp>
>>>>>>> vb_gcodeviewer_menu
#endif #endif
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
@ -57,7 +61,10 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
// On Apple the wxExecute fails, thus we use boost::process instead. // On Apple the wxExecute fails, thus we use boost::process instead.
BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\""; BOOST_LOG_TRIVIAL(info) << "Trying to spawn a new slicer \"" << bin_path.string() << "\"";
try { try {
path_to_open ? boost::process::spawn(bin_path, into_u8(*path_to_open)) : boost::process::spawn(bin_path, boost::process::args()); std::vector<std::string> args;
if (path_to_open)
args.emplace_back(into_u8(*path_to_open));
boost::process::spawn(bin_path, args);
} catch (const std::exception &ex) { } catch (const std::exception &ex) {
BOOST_LOG_TRIVIAL(error) << "Failed to spawn a new slicer \"" << bin_path.string() << "\": " << ex.what(); BOOST_LOG_TRIVIAL(error) << "Failed to spawn a new slicer \"" << bin_path.string() << "\": " << ex.what();
} }