From 2f690378ac55f521d94af2f6485ce2e2e16a86a9 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 6 Nov 2012 21:12:39 +0100 Subject: [PATCH] Reset modified flag after document is loaded, touch pad/pocket if its Type has changed --- src/Gui/Document.cpp | 5 ++++- src/Mod/PartDesign/App/FeaturePad.cpp | 1 + src/Mod/PartDesign/App/FeaturePocket.cpp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index a3d4390039..4bab9e58b6 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -668,7 +668,7 @@ void Document::RestoreDocFile(Base::Reader &reader) if (!xmlReader.getFilenames().empty()) xmlReader.readFiles(static_cast(reader)); - // reset modifeid flag + // reset modified flag setModified(false); } @@ -697,6 +697,9 @@ void Document::slotFinishRestoreDocument(const App::Document& doc) for (it = d->_ViewProviderMap.begin(); it != d->_ViewProviderMap.end(); ++it) { it->second->finishRestoring(); } + + // reset modified flag + setModified(false); } /** diff --git a/src/Mod/PartDesign/App/FeaturePad.cpp b/src/Mod/PartDesign/App/FeaturePad.cpp index 1b97da8fe6..47e459204c 100644 --- a/src/Mod/PartDesign/App/FeaturePad.cpp +++ b/src/Mod/PartDesign/App/FeaturePad.cpp @@ -64,6 +64,7 @@ Pad::Pad() short Pad::mustExecute() const { if (Placement.isTouched() || + Type.isTouched() || Length.isTouched() || Length2.isTouched() || UpToFace.isTouched()) diff --git a/src/Mod/PartDesign/App/FeaturePocket.cpp b/src/Mod/PartDesign/App/FeaturePocket.cpp index 351fb512d3..f32d4ae22c 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.cpp +++ b/src/Mod/PartDesign/App/FeaturePocket.cpp @@ -66,6 +66,7 @@ Pocket::Pocket() short Pocket::mustExecute() const { if (Placement.isTouched() || + Type.isTouched() || Length.isTouched() || UpToFace.isTouched()) return 1;