From 0ea662e56f713a68b80b45b1accad7f241b4eed8 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 14 Nov 2023 14:14:56 +0100 Subject: [PATCH] Another fix-up of 187ff61 (fw alert dialog for bgcode) --- src/slic3r/GUI/Plater.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 15786db19e..602b74d5b5 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -6834,26 +6834,13 @@ void Plater::export_gcode(bool prefer_removable) }; wxString error_str; -#if 1 // #ysFIXME > clear code after testing if (check_for_error(output_path, error_str)) { ErrorDialog(this, error_str, [this](const std::string& key) -> void { sidebar().jump_to_option(key); }).ShowModal(); output_path.clear(); + } else { + alert_when_exporting_binary_gcode(wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_bool("gcode_binary"), + wxGetApp().preset_bundle->printers.get_edited_preset().config.opt_string("printer_notes")); } -#else - while (check_for_error(output_path, error_str)) { - show_error(this, error_str); - dlg.SetFilename(from_path(output_path.filename())); - if (dlg.ShowModal() == wxID_OK) - output_path = into_path(dlg.GetPath()); - else { - output_path.clear(); - break; - } - } -#endif - alert_when_exporting_binary_gcode(wxGetApp().preset_bundle->prints.get_edited_preset().config.opt_bool("gcode_binary"), - wxGetApp().preset_bundle->printers.get_edited_preset().config.opt_string("printer_notes")); - } }