From 8c5fddf15099e94bfb7692d5008494476bfb88e3 Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Mon, 25 Jul 2016 20:49:28 -0400
Subject: [PATCH] Fix pathgrid selection mode not being removed from toolbar.

---
 apps/opencs/view/render/pathgridmode.cpp | 18 ++++++++++++++----
 apps/opencs/view/render/pathgridmode.hpp |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp
index 87ec80556..228b2b5e7 100644
--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@@ -35,10 +35,10 @@ namespace CSVRender
     {
         return QString(
             "Pathgrid editing"
-            "<ul><li>Primary edit: Add node to scene</li>"
-            "<li>Secondary edit: Connect selected nodes to node</li>"
-            "<li>Primary drag: Move selected nodes</li>"
-            "<li>Secondary drag: Connect one node to another</li>"
+            "<ul><li>Press {scene-edit-primary} to add a node to the cursor location</li>"
+            "<li>Press {scene-edit-secondary} to connect the selected nodes to the node beneath the cursor</li>"
+            "<li>Press {scene-edit-primary} and drag to move selected nodes</li>"
+            "<li>Press {scene-edit-secondary} and drag to connect one node to another</li>"
             "</ul><p>Note: Only a single cell's pathgrid may be edited at a time");
     }
 
@@ -53,6 +53,16 @@ namespace CSVRender
         toolbar->addTool(mSelectionMode);
     }
 
+    void PathgridMode::deactivate(CSVWidget::SceneToolbar* toolbar)
+    {
+        if (mSelectionMode)
+        {
+            toolbar->removeTool (mSelectionMode);
+            delete mSelectionMode;
+            mSelectionMode = 0;
+        }
+    }
+
     void PathgridMode::primaryEditPressed(const WorldspaceHitResult& hitResult)
     {
         if (CSMPrefs::get()["3D Scene Input"]["context-select"].isTrue() &&
diff --git a/apps/opencs/view/render/pathgridmode.hpp b/apps/opencs/view/render/pathgridmode.hpp
index 908eefa5b..e34208f8c 100644
--- a/apps/opencs/view/render/pathgridmode.hpp
+++ b/apps/opencs/view/render/pathgridmode.hpp
@@ -19,6 +19,8 @@ namespace CSVRender
 
             virtual void activate(CSVWidget::SceneToolbar* toolbar);
 
+            virtual void deactivate(CSVWidget::SceneToolbar* toolbar);
+
             virtual void primaryEditPressed(const WorldspaceHitResult& hit);
 
             virtual void secondaryEditPressed(const WorldspaceHitResult& hit);