From d259b39c303b558e8e47c5ac24e2010db4c6b838 Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Sun, 21 Jan 2018 21:27:56 -0500
Subject: [PATCH] Reset tools when clearing gerber draw layers

Fixes: lp:1744600
* https://bugs.launchpad.net/kicad/+bug/1744600
---
 gerbview/clear_gbr_drawlayers.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gerbview/clear_gbr_drawlayers.cpp b/gerbview/clear_gbr_drawlayers.cpp
index bba59750e..39af605b9 100644
--- a/gerbview/clear_gbr_drawlayers.cpp
+++ b/gerbview/clear_gbr_drawlayers.cpp
@@ -36,6 +36,7 @@
 #include <class_gerber_file_image_list.h>
 #include <class_gerbview_layer_widget.h>
 #include <view/view.h>
+#include <tool/tool_manager.h>
 
 bool GERBVIEW_FRAME::Clear_DrawLayers( bool query )
 {
@@ -50,6 +51,9 @@ bool GERBVIEW_FRAME::Clear_DrawLayers( bool query )
 
     if( auto canvas = GetGalCanvas() )
     {
+        if( m_toolManager )
+            m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
+
         canvas->GetView()->Clear();
     }
 
@@ -76,6 +80,9 @@ void GERBVIEW_FRAME::Erase_Current_DrawLayer( bool query )
 
     SetCurItem( NULL );
 
+    if( m_toolManager )
+        m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
+
     GetImagesList()->DeleteImage( layer );
 
     ReFillLayerWidget();
-- 
2.14.1