remove shortkeys from shortkey_to_tool_map_

this should fix ros-visualization#880

src/rviz/tool_manager.cpp

@@ -137,7 +137,12 @@ void ToolManager::handleChar( QKeyEvent* event, RenderPanel* panel )
   }
 
   // check if the incoming key triggers the activation of another tool
-  Tool* tool = shortkey_to_tool_map_[ event->key() ];
+  Tool* tool = NULL;
+  if( shortkey_to_tool_map_.find(event->key()) != shortkey_to_tool_map_.end() )
+  {
+    tool = shortkey_to_tool_map_[ event->key() ];
+  }
+
   if( tool )
   {
     // if there is a incoming tool check if it matches the current tool
@@ -277,7 +282,14 @@ void ToolManager::removeTool( int index )
   {
     setDefaultTool( fallback );
   }
+
   Q_EMIT toolRemoved( tool );
+
+  uint key;
+  if( toKey(  QString( tool->getShortcutKey() ), key ) )
+  {
+    shortkey_to_tool_map_.erase( key );
+  }
   delete tool;
   Q_EMIT configChanged();
 }