doing merge

2012-04-26 15:10:48 +02:00
parent d8f150e384
commit 2549b555bc
7 changed files with 118 additions and 2 deletions
--- a/src/Gui/Document.cpp
+++ b/src/Gui/Document.cpp
@@ -642,8 +642,13 @@ void Document::RestoreDocFile(Base::Reader &reader)
        std::string sMsg = "SetCamera ";
        sMsg += ppReturn;
        if (strcmp(ppReturn, "") != 0) { // non-empty attribute
-            if (d->_pcAppWnd->sendHasMsgToActiveView("SetCamera"))
-                d->_pcAppWnd->sendMsgToActiveView(sMsg.c_str());
+            try {
+                if (d->_pcAppWnd->sendHasMsgToActiveView("SetCamera"))
+                    d->_pcAppWnd->sendMsgToActiveView(sMsg.c_str());
+            }
+            catch (const Base::Exception& e) {
+                Base::Console().Error("%s\n", e.what());
+            }
        }
    }