diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp
--- kicad-6.0.6/common/tool/tool_manager.cpp	2022-06-17 18:11:16.000000000 -0700
+++ kicad-6.0.6-new/common/tool/tool_manager.cpp	2022-06-20 00:17:13.548239632 -0700
@@ -902,7 +902,7 @@
         m_menuOwner = -1;
 
         // Restore cursor settings
-        for( auto cursorSetting : m_cursorSettings )
+        for( auto const& cursorSetting : m_cursorSettings )
         {
             auto it = m_toolIdIndex.find( cursorSetting.first );
             wxASSERT( it != m_toolIdIndex.end() );