PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-16 02:02:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ys_splashscreen_on_mac'

Browse Source
This commit is contained in:
YuSanka
2020-10-03 03:18:01 +02:00
parent 6255792181 48f775decb
commit 52557b4263
3 changed files with 83 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/PrusaSlicer.cpp
View File

@@ -588,6 +588,12 @@ int CLI::run(int argc, char **argv)
// gui->autosave = m_config.opt_string("autosave");
GUI::GUI_App::SetInstance(gui);
#if ENABLE_GCODE_VIEWER
gui->m_after_init_loads.set_params(load_configs, m_extra_config, m_input_files, start_as_gcodeviewer);
#else
gui->m_after_init_loads.set_params(load_configs, m_extra_config, m_input_files);
#endif // ENABLE_GCODE_VIEWER
/*
#if ENABLE_GCODE_VIEWER
gui->CallAfter([gui, this, &load_configs, start_as_gcodeviewer] {
#else
@@ -625,6 +631,7 @@ int CLI::run(int argc, char **argv)
}
#endif // ENABLE_GCODE_VIEWER
});
*/
int result = wxEntry(argc, argv);
return result;
#else /* SLIC3R_GUI */