3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-21 07:41:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate

Browse source
This commit is contained in:
Enrico Turri 2018-06-04 09:29:16 +02:00
commit 8dc3a73571
6 changed files with 67 additions and 2008 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/xsp/GUI.xsp
View file

@ -66,11 +66,7 @@ bool check_unsaved_changes()
bool config_wizard_startup(int app_config_exists)
%code%{
try {
RETVAL=Slic3r::GUI::config_wizard_startup(app_config_exists != 0);
} catch (std::exception& e) {
croak("%s\n", e.what());
}
RETVAL=Slic3r::GUI::config_wizard_startup(app_config_exists != 0);
%};
void open_preferences_dialog(int preferences_event)