GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 21:59:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dk_instances' into master

Browse Source
This commit is contained in:
David Kocik 2020-10-05 15:12:17 +02:00
commit 6a12e75194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/PrusaSlicer.cpp
View File

@ -580,12 +580,13 @@ int CLI::run(int argc, char **argv)
GUI::GUI_App *gui = new GUI::GUI_App(); GUI::GUI_App *gui = new GUI::GUI_App();
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
bool gui_single_instance_setting = gui->app_config->get("single_instance") == "1"; if(!start_as_gcodeviewer) { // gcode viewer is currently not performing instance check
if (Slic3r::instance_check(argc, argv, gui_single_instance_setting)) { bool gui_single_instance_setting = gui->app_config->get("single_instance") == "1";
//TODO: do we have delete gui and other stuff? if (Slic3r::instance_check(argc, argv, gui_single_instance_setting)) {
return -1; //TODO: do we have delete gui and other stuff?
} return -1;
}
}
// gui->autosave = m_config.opt_string("autosave"); // gui->autosave = m_config.opt_string("autosave");
GUI::GUI_App::SetInstance(gui); GUI::GUI_App::SetInstance(gui);
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER