mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-12 03:27:55 +00:00
Fix input_filename_base using object name instead of project name (#13753)
This commit is contained in:
@@ -14839,7 +14839,8 @@ void Plater::export_gcode(bool prefer_removable)
|
|||||||
unsigned int state = this->p->update_restart_background_process(false, false);
|
unsigned int state = this->p->update_restart_background_process(false, false);
|
||||||
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
|
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
|
||||||
return;
|
return;
|
||||||
default_output_file = this->p->background_process.output_filepath_for_project("");
|
default_output_file = this->p->background_process.output_filepath_for_project(
|
||||||
|
into_path(this->p->get_project_filename(".3mf")));
|
||||||
} catch (const Slic3r::PlaceholderParserError &ex) {
|
} catch (const Slic3r::PlaceholderParserError &ex) {
|
||||||
// Show the error with monospaced font.
|
// Show the error with monospaced font.
|
||||||
show_error(this, ex.what(), true);
|
show_error(this, ex.what(), true);
|
||||||
@@ -14942,7 +14943,8 @@ void Plater::export_gcode_3mf(bool export_all)
|
|||||||
unsigned int state = this->p->update_restart_background_process(false, false);
|
unsigned int state = this->p->update_restart_background_process(false, false);
|
||||||
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
|
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
|
||||||
return;
|
return;
|
||||||
default_output_file = this->p->background_process.output_filepath_for_project("");
|
default_output_file = this->p->background_process.output_filepath_for_project(
|
||||||
|
into_path(this->p->get_project_filename(".3mf")));
|
||||||
}
|
}
|
||||||
catch (const Slic3r::PlaceholderParserError& ex) {
|
catch (const Slic3r::PlaceholderParserError& ex) {
|
||||||
// Show the error with monospaced font.
|
// Show the error with monospaced font.
|
||||||
@@ -16089,7 +16091,8 @@ void Plater::send_gcode_legacy(int plate_idx, Export3mfProgressFn proFn, bool us
|
|||||||
unsigned int state = this->p->update_restart_background_process(false, false);
|
unsigned int state = this->p->update_restart_background_process(false, false);
|
||||||
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
|
if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
|
||||||
return;
|
return;
|
||||||
default_output_file = this->p->background_process.output_filepath_for_project("");
|
default_output_file = this->p->background_process.output_filepath_for_project(
|
||||||
|
into_path(this->p->get_project_filename(".3mf")));
|
||||||
} catch (const Slic3r::PlaceholderParserError& ex) {
|
} catch (const Slic3r::PlaceholderParserError& ex) {
|
||||||
// Show the error with monospaced font.
|
// Show the error with monospaced font.
|
||||||
show_error(this, ex.what(), true);
|
show_error(this, ex.what(), true);
|
||||||
|
|||||||
Reference in New Issue
Block a user