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

Fix of the previous commit: When asking the operating system to open

Browse Source 
the datadir using the platform specific file explorer, enquote
and escape the path.
This commit is contained in:
bubnikv 2018-05-21 22:10:38 +02:00
parent 7b4aeef40c
commit 6b4fe7975f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xs/src/slic3r/GUI/GUI.cpp
View File

@ -5,8 +5,7 @@
#include <cmath> #include <cmath>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#if __APPLE__ #if __APPLE__
@ -931,6 +930,7 @@ void about()
void desktop_open_datadir_folder() void desktop_open_datadir_folder()
{ {
// Execute command to open a file explorer, platform dependent.
std::string cmd = std::string cmd =
#ifdef _WIN32 #ifdef _WIN32
"explorer " "explorer "
@ -940,7 +940,21 @@ void desktop_open_datadir_folder()
"xdg-open " "xdg-open "
#endif #endif
; ;
cmd += data_dir(); // Escape the path, platform dependent.
std::string path = data_dir();
#ifdef _WIN32
// Enclose the path into double quotes on Windows. A quote character is forbidden in file names,
// therefore it does not need to be escaped.
cmd += '"';
cmd += path;
cmd += '"';
#else
// Enclose the path into single quotes on Unix / OSX. All single quote characters need to be escaped
// inside a file name.
cmd += '\'';
boost::replace_all(path, "'", "\\'");
cmd += '\'';
#endif
::wxExecute(wxString::FromUTF8(cmd.c_str()), wxEXEC_ASYNC, nullptr); ::wxExecute(wxString::FromUTF8(cmd.c_str()), wxEXEC_ASYNC, nullptr);
} }