Fix #1834: segfault on addMaximizeButton

... for image/camera displays if no window manager is instantiated
ros-visualization · May 28, 2024 · fdcf656 · fdcf656
1 parent ba95c1f
commit fdcf656
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/rviz/default_plugin/camera_display.cpp b/src/rviz/default_plugin/camera_display.cpp
@@ -193,7 +193,8 @@ void CameraDisplay::onInitialize()
   render_panel_->initialize(context_->getSceneManager(), context_);
 
   setAssociatedWidget(render_panel_);
-  getAssociatedWidgetPanel()->addMaximizeButton();
+  if (auto* dock = getAssociatedWidgetPanel())
+    dock->addMaximizeButton();
 
   render_panel_->setAutoRender(false);
   render_panel_->setOverlaysEnabled(false);

diff --git a/src/rviz/default_plugin/image_display.cpp b/src/rviz/default_plugin/image_display.cpp
@@ -131,7 +131,8 @@ void ImageDisplay::onInitialize()
   render_panel_->initialize(img_scene_manager_, context_);
 
   setAssociatedWidget(render_panel_);
-  getAssociatedWidgetPanel()->addMaximizeButton();
+  if (auto* dock = getAssociatedWidgetPanel())
+    dock->addMaximizeButton();
 
   render_panel_->setAutoRender(false);
   render_panel_->setOverlaysEnabled(false);