diff options
| author | YuSanka <yusanka@gmail.com> | 2020-10-03 04:18:01 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2020-10-03 04:18:01 +0300 |
| commit | 52557b4263b15fc9829a9606dfe07035f6ce4e80 (patch) | |
| tree | db5a67909a040eade2967984c20254f2041d2fa2 /src/PrusaSlicer.cpp | |
| parent | 62557921814b27e54fc4e7f672e1545955c19a14 (diff) | |
| parent | 48f775decb0e1609ef4ab356f6a558666db2bfc0 (diff) | |
Merge remote-tracking branch 'origin/ys_splashscreen_on_mac'
Diffstat (limited to 'src/PrusaSlicer.cpp')
| -rw-r--r-- | src/PrusaSlicer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 8f96de3ed..38379dc0d 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -589,6 +589,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 gui->CallAfter([gui, this, &load_configs] { @@ -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 */ |