handle possible exceptions from onDocumentRestored()

2017-05-16 23:48:55 +02:00
parent 4d7554197e
commit 1be8c73dca
1 changed files with 7 additions and 2 deletions
--- a/src/App/Document.cpp
+++ b/src/App/Document.cpp
@@ -1591,8 +1591,13 @@ void Document::restore (void)
    // reset all touched
    for (std::map<std::string,DocumentObject*>::iterator It= d->objectMap.begin();It!=d->objectMap.end();++It) {
        It->second->connectRelabelSignals();
-        It->second->onDocumentRestored();
-        It->second->ExpressionEngine.onDocumentRestored();
+        try {
+            It->second->onDocumentRestored();
+            It->second->ExpressionEngine.onDocumentRestored();
+        }
+        catch (const Base::Exception& e) {
+            Base::Console().Error("Error in %s: %s\n", It->second->Label.getValue(), e.what());
+        }
        It->second->purgeTouched();
    }