From 7ce23ccb02f8366416f2bd3cc01aa5b193ca5e25 Mon Sep 17 00:00:00 2001
From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
Date: Tue, 12 Jul 2022 13:14:37 +0200
Subject: [PATCH 1/2] Draft: Fix setEdit in view_text.py

The setEdit function should import the Draft module to make sure draftToolBar is available.
---
 src/Mod/Draft/draftviewproviders/view_text.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Draft/draftviewproviders/view_text.py b/src/Mod/Draft/draftviewproviders/view_text.py
index 1dda2fdab9..9ae386481c 100644
--- a/src/Mod/Draft/draftviewproviders/view_text.py
+++ b/src/Mod/Draft/draftviewproviders/view_text.py
@@ -221,7 +221,9 @@ class ViewProviderText(ViewProviderDraftAnnotation):
     def setEdit(self,vobj,mode):
 
         import FreeCADGui
-        self.text = ''
+        if not hasattr(FreeCADGui, "draftToolBar"):
+            import Draft
+        self.text = ""
         FreeCADGui.draftToolBar.sourceCmd = self
         FreeCADGui.draftToolBar.taskUi()
         FreeCADGui.draftToolBar.textUi()

From 57699b1c25d1da60154aad6d7f0e7b1bc23b5bb7 Mon Sep 17 00:00:00 2001
From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
Date: Tue, 12 Jul 2022 21:58:34 +0200
Subject: [PATCH 2/2] Update view_text.py

Oops: import DraftGui instead of import Draft
---
 src/Mod/Draft/draftviewproviders/view_text.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Mod/Draft/draftviewproviders/view_text.py b/src/Mod/Draft/draftviewproviders/view_text.py
index 9ae386481c..e0fc077f53 100644
--- a/src/Mod/Draft/draftviewproviders/view_text.py
+++ b/src/Mod/Draft/draftviewproviders/view_text.py
@@ -222,7 +222,7 @@ class ViewProviderText(ViewProviderDraftAnnotation):
 
         import FreeCADGui
         if not hasattr(FreeCADGui, "draftToolBar"):
-            import Draft
+            import DraftGui
         self.text = ""
         FreeCADGui.draftToolBar.sourceCmd = self
         FreeCADGui.draftToolBar.taskUi()