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

boost::filesystem::canonical at non windows instance check path to binary

Browse source
This commit is contained in:
David Kocik 2020-10-15 15:22:34 +02:00
parent a009b24124
commit 7531da603b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,7 +231,7 @@ namespace instance_check_internal
BOOST_LOG_TRIVIAL(trace) << "DBus message sent."; BOOST_LOG_TRIVIAL(trace) << "DBus message sent.";
// free the message and close the connection // free the message and close the connection
dbus_message_unref(msg); dbus_message_unref(msg);
dbus_connection_unref(conn); dbus_connection_unref(conn);
return true; return true;
} }
@ -242,8 +242,14 @@ namespace instance_check_internal
} //namespace instance_check_internal } //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)
{ {
std::size_t hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string()); std::size_t hashed_path =
#ifdef _WIN32
std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
#else
std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0])).string());
#endif // win32
std::string lock_name = std::to_string(hashed_path); std::string lock_name = std::to_string(hashed_path);
GUI::wxGetApp().set_instance_hash(hashed_path); GUI::wxGetApp().set_instance_hash(hashed_path);
BOOST_LOG_TRIVIAL(debug) <<"full path: "<< lock_name; BOOST_LOG_TRIVIAL(debug) <<"full path: "<< lock_name;