From 01e2746a3a5667505552f2504320e5bc79a469de Mon Sep 17 00:00:00 2001 From: Raphael <68374617+raphaelscholle@users.noreply.github.com> Date: Sun, 10 Dec 2023 20:28:14 +0100 Subject: [PATCH] merge shutdown "fix" (#632) * Untested Fix to GND Bat cell voltage * hide FC shutdown button --------- Co-authored-by: pilotnbr1 --- qml/ui/configpopup/status/FooterRebootShutdownWarning.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qml/ui/configpopup/status/FooterRebootShutdownWarning.qml b/qml/ui/configpopup/status/FooterRebootShutdownWarning.qml index 8a6d582b8..f9251aa03 100644 --- a/qml/ui/configpopup/status/FooterRebootShutdownWarning.qml +++ b/qml/ui/configpopup/status/FooterRebootShutdownWarning.qml @@ -16,6 +16,8 @@ Item { property bool m_supports_reboot_actions: true + //m_supports_shutdown_actions added due to testers reporting FC does not shutdown + property bool m_supports_shutdown_actions: true function get_show_power_actions(){ if(m_type==0){ @@ -23,6 +25,8 @@ Item { }else if(m_type==1){ return _ohdSystemAir.is_alive } + //hide FC shutdown button + m_supports_shutdown_actions=false return _fcMavlinkSystem.is_alive } @@ -60,7 +64,7 @@ Item { } } Button{ - visible: get_show_power_actions() && m_supports_reboot_actions + visible: get_show_power_actions() && m_supports_shutdown_actions Layout.alignment: Qt.AlignRight Layout.rightMargin: 10 text: qsTr("SHUTDOWN")