From 9e3cb149f30e3e19ca93aea04934bd38aecc77c4 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Wed, 3 Jun 2020 13:16:21 +0100
Subject: [PATCH] Reset selected tool when resetting configuration.

---
 src/toolbars/ToolsToolBar.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp
index cc018fd3f..81fa0c63c 100644
--- a/src/toolbars/ToolsToolBar.cpp
+++ b/src/toolbars/ToolsToolBar.cpp
@@ -205,6 +205,8 @@ void ToolsToolBar::Populate()
    mTool[ slideTool    ] = MakeTool( this, bmpTimeShift, slideTool, XO("Slide Tool") );
    mTool[ multiTool    ] = MakeTool( this, bmpMulti, multiTool, XO("Multi-Tool") );
 
+   // It's OK to reset the tool when regenerating this, e.g after visiting preferences.
+   SetCurrentTool( selectTool );
    mTool[mCurrentTool]->PushDown();
 
    RegenerateTooltips();