From 640f9cc8013d4c510ab0fa51bbbc8fcbbb275908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Mon, 14 Nov 2022 10:22:18 +0100
Subject: [PATCH] commander: fix initialization order of _failsafe_flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this case it did not cause any problems.
Fixes a compiler warning:
/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.cpp:39:21: error: member ‘HealthAndArmingChecks::_failsafe_flags’ is used uninitialized [-Werror=uninitialized]
   39 |           _reporter(_failsafe_flags)
      |                     ^~~~~~~~~~~~~~~
---
 .../HealthAndArmingChecks/HealthAndArmingChecks.cpp       | 3 +--
 .../HealthAndArmingChecks/HealthAndArmingChecks.hpp       | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.cpp b/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.cpp
index 9c4ec57950..2428d94943 100644
--- a/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.cpp
+++ b/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.cpp
@@ -35,8 +35,7 @@
 
 HealthAndArmingChecks::HealthAndArmingChecks(ModuleParams *parent, vehicle_status_s &status)
 	: ModuleParams(parent),
-	  _context(status),
-	  _reporter(_failsafe_flags)
+	  _context(status)
 {
 	// Initialize mode requirements to invalid
 	_failsafe_flags.angular_velocity_invalid = true;
diff --git a/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.hpp b/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.hpp
index 084376d130..d12aa585ca 100644
--- a/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.hpp
+++ b/src/modules/commander/HealthAndArmingChecks/HealthAndArmingChecks.hpp
@@ -103,12 +103,12 @@ public:
 protected:
 	void updateParams() override;
 private:
-	Context _context;
-	Report _reporter;
-	orb_advert_t _mavlink_log_pub{nullptr};
-
 	failsafe_flags_s _failsafe_flags{};
 
+	Context _context;
+	Report _reporter{_failsafe_flags};
+	orb_advert_t _mavlink_log_pub{nullptr};
+
 	uORB::Publication<health_report_s> _health_report_pub{ORB_ID(health_report)};
 	uORB::Publication<failsafe_flags_s> _failsafe_flags_pub{ORB_ID(failsafe_flags)};