3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of #8175: crash with Import SL1 in some cases

Browse source 
- do not process non-existing file, report as error
- cancelling the dialog is not an error, but a check in finalize() is needed
- fixed some localization issues (serious btw: the ToStdString returned "" in one of the cases, which would in turn ignore the error and proceed as if if did not happen)
- reset err in reset(), just to be sure
This commit is contained in:
Lukas Matena 2022-04-13 10:51:31 +02:00
parent 3b94494c4f
commit 1a4ce039da
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/slic3r/GUI/Jobs/SLAImportJob.cpp
View file

@ -141,7 +141,7 @@ void SLAImportJob::process()
return !was_canceled();
};
if (p->path.empty()) return;
if (p->path.empty() || ! p->err.empty()) return;
std::string path = p->path.ToUTF8().data();
try {
@ -155,8 +155,8 @@ void SLAImportJob::process()
break;
}
} catch (MissingProfileError &) {
p->err = _L("The SLA archive doesn't contain any presets. "
"Please activate some SLA printer preset first before importing that SLA archive.").ToStdString();
p->err = _u8L("The SLA archive doesn't contain any presets. "
"Please activate some SLA printer preset first before importing that SLA archive.");
} catch (std::exception &ex) {
p->err = ex.what();
}
@ -172,6 +172,7 @@ void SLAImportJob::reset()
p->profile = m_plater->sla_print().full_print_config();
p->win = {2, 2};
p->path.Clear();
p->err = "";
}
void SLAImportJob::prepare()
@ -182,6 +183,10 @@ void SLAImportJob::prepare()
auto path = p->import_dlg.get_path();
auto nm = wxFileName(path);
p->path = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : nm.GetFullPath();
if (p->path.empty()) {
p->err = _u8L("The file does not exist.");
return;
}
p->sel = p->import_dlg.get_selection();
p->win = p->import_dlg.get_marchsq_windowsize();
p->config_substitutions.clear();
@ -201,14 +206,20 @@ void SLAImportJob::finalize()
return;
}
if (p->path.empty()) {
// This happens when the user cancels the import dialog. That is not
// an error to report, but we cannot continue either.
return;
}
std::string name = wxFileName(p->path).GetName().ToUTF8().data();
if (p->profile.empty()) {
m_plater->get_notification_manager()->push_notification(
NotificationType::CustomNotification,
NotificationManager::NotificationLevel::WarningNotificationLevel,
_L("The imported SLA archive did not contain any presets. "
"The current SLA presets were used as fallback.").ToStdString());
_u8L("The imported SLA archive did not contain any presets. "
"The current SLA presets were used as fallback."));
}
if (p->sel != Sel::modelOnly) {