3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-29 19:53:44 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'dk_instances' into master

Browse source
This commit is contained in:
David Kocik 2020-10-15 15:41:08 +02:00
commit 650bbb3484
1 changed files with 9 additions and 3 deletions
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.";
// free the message and close the connection
dbus_message_unref(msg);
dbus_message_unref(msg);
dbus_connection_unref(conn);
return true;
}
@ -242,8 +242,14 @@ namespace instance_check_internal
} //namespace instance_check_internal
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);
GUI::wxGetApp().set_instance_hash(hashed_path);
BOOST_LOG_TRIVIAL(debug) <<"full path: "<< lock_name;