diff options
author | David Kocik <kocikdav@gmail.com> | 2020-10-14 10:40:54 +0300 |
---|---|---|
committer | David Kocik <kocikdav@gmail.com> | 2020-10-14 10:40:54 +0300 |
commit | d7686d7e6a70ce15d2b47d6d4295d5dedcb50fdb (patch) | |
tree | 0c7ea3ddfa4ff40b5ef1f49a2cf78a2b5a6bcbd9 /src/slic3r | |
parent | 5e80dda623bb7d2b1cc8c29efeafb5aa79877ab5 (diff) | |
parent | 2f5bce3d534daa63f4dd94ec0f0efa209cc0fd69 (diff) |
Merge branch 'dk_instances' into master
Diffstat (limited to 'src/slic3r')
-rw-r--r-- | src/slic3r/GUI/InstanceCheck.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index abcdea254..a8b1b8657 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -254,7 +254,7 @@ bool instance_check(int argc, char** argv, bool app_config_single_instance) GUI::wxGetApp().init_single_instance_checker(lock_name + ".lock", data_dir() + "/cache/"); if (cla.should_send.value() && GUI::wxGetApp().single_instance_checker()->IsAnotherRunning()) { #else // mac & linx - if (cla.should_send.value() && instance_check_internal::get_lock(lock_name + ".lock", data_dir() + "/cache/")) { + if (*cla.should_send && instance_check_internal::get_lock(lock_name + ".lock", data_dir() + "/cache/")) { #endif instance_check_internal::send_message(cla.cl_string, lock_name); BOOST_LOG_TRIVIAL(info) << "instance check: Another instance found. This instance will terminate."; |