Fix segfault when no tools are available (#1729)

In that case, current_tool_ is NULL...
ros-visualization · Mar 18, 2022 · 23607d9 · 23607d9
1 parent 16df936
commit 23607d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/rviz/tool_manager.cpp b/src/rviz/tool_manager.cpp
@@ -149,7 +149,7 @@ void ToolManager::handleChar(QKeyEvent* event, RenderPanel* panel)
     else
     {
       // if no, check if the current tool accesses all key events
-      if (current_tool_->accessAllKeys())
+      if (current_tool_ && current_tool_->accessAllKeys())
       {
         // if yes, pass the key
         current_tool_->processKeyEvent(event, panel);
@@ -161,7 +161,7 @@ void ToolManager::handleChar(QKeyEvent* event, RenderPanel* panel)
       }
     }
   }
-  else
+  else if (current_tool_)
   {
     // if the incoming key triggers no other tool,
     // just hand down the key event