From 1b1c0316d4aa1fcd3313b4e2372c71c0fc35dc0a Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 24 Apr 2016 18:27:24 +0200
Subject: [PATCH] + do not allow to create primitives while a task panel is
 open to avoid mess on the undo/redo stack

---
 src/Mod/PartDesign/Gui/CommandPrimitive.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
index f92a301cee..0b2be32fdd 100644
--- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
+++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp
@@ -33,6 +33,7 @@
 #include <App/Document.h>
 #include <Gui/Command.h>
 #include <Gui/Action.h>
+#include <Gui/Control.h>
 #include <Gui/MainWindow.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Application.h>
@@ -226,10 +227,7 @@ void CmdPrimtiveCompAdditive::languageChange()
 
 bool CmdPrimtiveCompAdditive::isActive(void)
 {
-    if (getActiveGuiDocument())
-        return true;
-    else
-        return false;
+    return (hasActiveDocument() && !Gui::Control().activeDialog());
 }
 
 DEF_STD_CMD_ACL(CmdPrimtiveCompSubtractive);
@@ -426,10 +424,7 @@ void CmdPrimtiveCompSubtractive::languageChange()
 
 bool CmdPrimtiveCompSubtractive::isActive(void)
 {
-    if (getActiveGuiDocument())
-        return true;
-    else
-        return false;
+    return (hasActiveDocument() && !Gui::Control().activeDialog());
 }
 
 //===========================================================================