Draft: Fixed grid not appearing on working plane setup

src/Mod/Draft/DraftSnap.py

@@ -1378,10 +1378,13 @@ class Snapper:
             self.toolbar.hide()
             self.toolbar.toggleViewAction().setVisible(True)
 
-    def setGrid(self):
+    def setGrid(self,init=False):
         "sets the grid, if visible"
+        if init:
+            if not self.grid:
+                self.grid = DraftTrackers.gridTracker()
         if self.grid and (not self.forceGridOff):
-            if self.grid.Visible:
+            if init or self.grid.Visible:
                 self.grid.set()
             self.setTrackers()
             
@@ -1408,10 +1411,11 @@ class Snapper:
             self.extLine2 = self.trackers[8][i]
             self.holdTracker = self.trackers[9][i]
         else:
-            if Draft.getParam("grid",True):
-                self.grid = DraftTrackers.gridTracker()
-            else:
-                self.grid = None
+            if not self.grid:
+                if Draft.getParam("grid",True):
+                    self.grid = DraftTrackers.gridTracker()
+                else:
+                    self.grid = None
             self.tracker = DraftTrackers.snapTracker()
             self.trackLine = DraftTrackers.lineTracker()
             if self.snapStyle:

src/Mod/Draft/DraftTools.py

@@ -514,7 +514,7 @@ class SelectPlane(DraftTool):
             plv = 'd('+str(arg.x)+','+str(arg.y)+','+str(arg.z)+')'
             self.ui.wplabel.setText(plv+suffix)
         self.ui.wplabel.setToolTip(translate("draft", "Current working plane:",utf8_decode=True)+self.ui.wplabel.text())
-        FreeCADGui.doCommandGui("FreeCADGui.Snapper.setGrid()")
+        FreeCADGui.doCommandGui("FreeCADGui.Snapper.setGrid(init=True)")
 
 #---------------------------------------------------------------------------
 # Geometry constructors