From e638705bc4d32141a92b73b09e3b2fe5c9deef1a Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Tue, 8 Jan 2019 11:43:36 -0200
Subject: [PATCH] Draft: Fixed grid not appearing on working plane setup

---
 src/Mod/Draft/DraftSnap.py  | 16 ++++++++++------
 src/Mod/Draft/DraftTools.py |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
index 37fdb152c8..adb836e41a 100644
--- a/src/Mod/Draft/DraftSnap.py
+++ b/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:
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index f6df2b38bf..53093aef35 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/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