From 500c45e79820a852a57a2ebfc0eecc0b1463f344 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 16 Jun 2021 20:44:21 -0400 Subject: [PATCH] uORB: Subscription check if uORB::Manager instance is valid - this is necessary if uORB::Subscription is used with static storage duration --- platforms/common/uORB/Subscription.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platforms/common/uORB/Subscription.cpp b/platforms/common/uORB/Subscription.cpp index 39280ad10a..276e4ac8fa 100644 --- a/platforms/common/uORB/Subscription.cpp +++ b/platforms/common/uORB/Subscription.cpp @@ -49,8 +49,7 @@ bool Subscription::subscribe() return true; } - if (_orb_id != ORB_ID::INVALID) { - + if ((_orb_id != ORB_ID::INVALID) && uORB::Manager::get_instance()) { DeviceMaster *device_master = uORB::Manager::get_instance()->get_device_master(); if (device_master != nullptr) {