From 7a8e0dcccd629c02a191b9c7204aa84b11456ce1 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Fri, 6 Dec 2019 16:37:15 +0100
Subject: [PATCH] Better implementation of shutdown confirmation (#7157)

This fixes #7129
---
 radio/src/opentx.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 6d850467e..75f52fb5e 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2110,7 +2110,13 @@ uint32_t pwrCheck()
           lcdClear();
 
           POPUP_CONFIRMATION(STR_MODEL_SHUTDOWN, nullptr);
+#if defined(SHUTDOWN_CONFIRMATION)
+          if (TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm) {
+            SET_WARNING_INFO(STR_MODEL_STILL_POWERED, sizeof(TR_MODEL_STILL_POWERED), 0);
+          }
+#else
           SET_WARNING_INFO(STR_MODEL_STILL_POWERED, sizeof(TR_MODEL_STILL_POWERED), 0);
+#endif
           event_t evt = getEvent(false);
           DISPLAY_WARNING(evt);
           lcdRefresh();