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

Fix of Compile error in InstanceCheck.cpp on Linux (#4877)

Browse Source
This commit is contained in:
Vojtech Bubnik 2020-10-15 07:45:36 +02:00
parent 6eee0c043c
commit 263759aca6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,7 @@ bool instance_check(int argc, char** argv, bool app_config_single_instance)
if (cla.should_send.value() && GUI::wxGetApp().single_instance_checker()->IsAnotherRunning()) { if (cla.should_send.value() && GUI::wxGetApp().single_instance_checker()->IsAnotherRunning()) {
#else // mac & linx #else // mac & linx
// get_lock() creates the lockfile therefore *cla.should_send is checked after // get_lock() creates the lockfile therefore *cla.should_send is checked after
if (instance_check_internal::get_lock(lock_name + ".lock", data_dir() + "/cache/"&& *cla.should_send)) { if (instance_check_internal::get_lock(lock_name + ".lock", data_dir() + "/cache/") && *cla.should_send) {
#endif #endif
instance_check_internal::send_message(cla.cl_string, lock_name); instance_check_internal::send_message(cla.cl_string, lock_name);
BOOST_LOG_TRIVIAL(info) << "instance check: Another instance found. This instance will terminate."; BOOST_LOG_TRIVIAL(info) << "instance check: Another instance found. This instance will terminate.";

1
src/slic3r/GUI/Plater.cpp
View File

@ -3483,7 +3483,6 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
void Plater::priv::on_slicing_completed(wxCommandEvent & evt) void Plater::priv::on_slicing_completed(wxCommandEvent & evt)
{ {
//notification_manager->push_notification(NotificationType::SlicingComplete, *q->get_current_canvas3D(), evt.GetInt());
notification_manager->push_slicing_complete_notification(*q->get_current_canvas3D(), evt.GetInt(), is_sidebar_collapsed()); notification_manager->push_slicing_complete_notification(*q->get_current_canvas3D(), evt.GetInt(), is_sidebar_collapsed());
switch (this->printer_technology) { switch (this->printer_technology) {