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

Own implementation of lockfile instead of wx on linux/mac. Wx version keeps poping up messege boxes after crash. Own implementation doesnt delete lockfile after use.

Browse Source
This commit is contained in:
David Kocik 2020-05-14 17:20:02 +02:00
parent 65a37ffaa1
commit 69e9805982
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/InstanceCheck.cpp
View File

@ -111,23 +111,23 @@ namespace instance_check_internal
#else
static int get_lock(const std::string& version)
static bool get_lock(const std::string& name, const std::string& path)
{
std::string dest_dir = data_dir();
std::string dest_dir = path + name;
BOOST_LOG_TRIVIAL(debug) <<"full lock path: "<< dest_dir;
struct flock fl;
int fdlock;
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
fl.l_start = 0;
fl.l_len = 1;
dest_dir += "/cache/prusaslicer-" + version + ".lock";
if ((fdlock = open(dest_dir.c_str(), O_WRONLY | O_CREAT, 0666)) == -1)
return false;
return true;
if (fcntl(fdlock, F_SETLK, &fl) == -1)
return false;
return true;
return true;
return false;
}
#endif //WIN32
@ -232,9 +232,13 @@ bool instance_check(int argc, char** argv, bool app_config_single_instance)
std::string lock_name = std::to_string(hashed_path);
GUI::wxGetApp().set_instance_hash(hashed_path);
BOOST_LOG_TRIVIAL(debug) <<"full path: "<< lock_name;
GUI::wxGetApp().init_single_instance_checker(lock_name + ".lock", data_dir() + "/cache/");
instance_check_internal::CommandLineAnalysis cla = instance_check_internal::process_command_line(argc, argv);
#ifdef _WIN32
GUI::wxGetApp().init_single_instance_checker(lock_name + ".lock", data_dir() + "/cache/");
if ((cla.should_send || app_config_single_instance) && GUI::wxGetApp().single_instance_checker()->IsAnotherRunning()) {
#else // mac & linx
if (instance_check_internal::get_lock(lock_name + ".lock", data_dir() + "/cache/") && (cla.should_send || app_config_single_instance)) {
#endif
instance_check_internal::send_message(cla.cl_string, lock_name);
BOOST_LOG_TRIVIAL(info) << "instance check: Another instance found. This instance will terminate.";
return true;