3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

boost canonical fix at instance check. Hopefully a fix of #4973

Browse source
This commit is contained in:
David Kocik 2020-11-17 14:44:18 +01:00
parent 1e12b99338
commit 16dd7c74f1
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/InstanceCheck.cpp
View file

@ -251,11 +251,24 @@ namespace instance_check_internal
bool instance_check(int argc, char** argv, bool app_config_single_instance) bool instance_check(int argc, char** argv, bool app_config_single_instance)
{ {
#ifndef _WIN32
boost::system::error_code ec;
#endif
std::size_t hashed_path = std::size_t hashed_path =
#ifdef _WIN32 #ifdef _WIN32
std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string()); std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
#else #else
std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0])).string()); std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0]), ec).string());
if(ec.value() > 0) { // canonical was not able to find execitable (can happen with appimage on some systems)
ec.clear();
// Compose path with boost canonical of folder and filename
hashed_path = std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0]).parent_path(), ec).string() + "/" + boost::filesystem::system_complete(argv[0]).filename().string());
if(ec.value() > 0) {
// Still not valid, process without canonical
hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
}
}
#endif // win32 #endif // win32
std::string lock_name = std::to_string(hashed_path); std::string lock_name = std::to_string(hashed_path);