kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: [skip ci] improve exception handling:

Browse Source 
* handle all exceptions in Application::onLastWindowClosed because this method can be (indirectly)  called from ~BaseView and would otherwise trigger std::terminate()
* handle exceptions in PropertyEditor::closeTransaction() because when recomputing a document while closing it leaves the editor in a bad state
This commit is contained in:
wmayer
2021-02-25 12:23:13 +01:00
parent 17a848dfe1
commit 5b864424db
3 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Gui/propertyeditor/PropertyEditor.cpp
View File

@@ -258,20 +258,38 @@ void PropertyEditor::onItemActivated ( const QModelIndex & index )
setupTransaction(index);
}
void PropertyEditor::recomputeDocument(App::Document* doc)
{
try {
if (doc) {
if (!doc->isTransactionEmpty()) {
// Between opening and committing a transaction a recompute
// could already have been done
if (doc->isTouched())
doc->recompute();
}
}
}
// do not re-throw
catch (const Base::Exception& e) {
e.ReportException();
}
catch (const std::exception& e) {
Base::Console().Error("Unhandled std::exception caught in PropertyEditor::recomputeDocument.\n"
"The error message is: %s\n", e.what());
}
catch (...) {
Base::Console().Error("Unhandled unknown exception caught in PropertyEditor::recomputeDocument.\n");
}
}
void PropertyEditor::closeTransaction()
{
int tid = 0;
if(App::GetApplication().getActiveTransaction(&tid) && tid == transactionID) {
if (App::GetApplication().getActiveTransaction(&tid) && tid == transactionID) {
if (autoupdate) {
App::Document* doc = App::GetApplication().getActiveDocument();
if (doc) {
if (!doc->isTransactionEmpty()) {
// Between opening and committing a transaction a recompute
// could already have been done
if (doc->isTouched())
doc->recompute();
}
}
recomputeDocument(doc);
}
App::GetApplication().closeActiveTransaction();
}