From bca9684ec3ab9a46fe7eee844c6ac780efb8364d Mon Sep 17 00:00:00 2001
From: Wanderer Fan <wandererfan@gmail.com>
Date: Thu, 23 Dec 2021 15:29:04 -0500
Subject: [PATCH] [TD]prevent touched but must be execute on DrawPage

---
 src/Mod/TechDraw/App/DrawPage.cpp | 2 +-
 src/Mod/TechDraw/Gui/Command.cpp  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp
index 7d944593e84b..db278bb76e03 100644
--- a/src/Mod/TechDraw/App/DrawPage.cpp
+++ b/src/Mod/TechDraw/App/DrawPage.cpp
@@ -163,7 +163,7 @@ void DrawPage::onChanged(const App::Property* prop)
 //Page is just a container. It doesn't "do" anything.
 App::DocumentObjectExecReturn *DrawPage::execute(void)
 {
-    return App::DocumentObject::StdReturn;
+    return App::DocumentObject::execute();
 }
 
 // this is now irrelevant, b/c DP::execute doesn't do anything. 
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index ea9bacd75e89..4d2338af94c2 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -136,6 +136,7 @@ void CmdTechDrawPageDefault::activated(int iMsg)
         doCommand(Doc,"App.activeDocument().%s.Template = '%s'",TemplateName.c_str(), templateFileName.toStdString().c_str());
         doCommand(Doc,"App.activeDocument().%s.Template = App.activeDocument().%s",PageName.c_str(),TemplateName.c_str());
 
+        updateActive();
         commitCommand();
         TechDraw::DrawPage* fp = dynamic_cast<TechDraw::DrawPage*>(getDocument()->getObject(PageName.c_str()));
         if (!fp) {
@@ -215,6 +216,7 @@ void CmdTechDrawPageTemplate::activated(int iMsg)
         doCommand(Doc,"App.activeDocument().%s.Template = App.activeDocument().%s",PageName.c_str(),TemplateName.c_str());
         // consider renaming DrawSVGTemplate.Template property?
 
+        updateActive();
         commitCommand();
         TechDraw::DrawPage* fp = dynamic_cast<TechDraw::DrawPage*>(getDocument()->getObject(PageName.c_str()));
         if (!fp) {