From 071163e30ae18aa782d785a85dd9ddd6b55a9a16 Mon Sep 17 00:00:00 2001 From: Ryan Friedman Date: Mon, 22 Jan 2024 22:40:49 -0700 Subject: [PATCH] Linters and simplify logic Signed-off-by: Ryan Friedman --- src/CameraZoomPlugin.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/CameraZoomPlugin.cc b/src/CameraZoomPlugin.cc index dfb00b37..0a16ba48 100644 --- a/src/CameraZoomPlugin.cc +++ b/src/CameraZoomPlugin.cc @@ -165,7 +165,8 @@ void CameraZoomPlugin::Impl::OnZoom(const msgs::Double &_msg) void CameraZoomPlugin::Impl::InitialiseCamera() { // Wait for render engine to be available. - if (rendering::loadedEngines().empty()) { + if (rendering::loadedEngines().empty()) + { return; } @@ -173,15 +174,11 @@ void CameraZoomPlugin::Impl::InitialiseCamera() if (!this->scene) { this->scene = rendering::sceneFromFirstRenderEngine(); - if (!this->scene) { - gzerr << "Failed to get scene in InitialiseCamera()!\n"; - return; - } - } // Return if scene not ready or no sensors available. - if (!this->scene->IsInitialized() || + if (this->scene == nullptr || + !this->scene->IsInitialized() || this->scene->SensorCount() == 0) { gzwarn << "No scene or camera sensors available.\n";