From 4965927d397f5870685adce3f53af8a256da40f7 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 13 Jun 2021 12:51:55 +0200
Subject: [PATCH] B/W: make shutdown confirmation depending on the issue at
 hand

Resolve #199
---
 radio/src/opentx.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 923ebb6a0..e934bcdcb 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2074,15 +2074,15 @@ uint32_t pwrCheck()
 
           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);
+          const char* msg = STR_MODEL_STILL_POWERED;
+          uint8_t msg_len = sizeof(TR_MODEL_STILL_POWERED);
+          if (usbPlugged() && getSelectedUsbMode() != USB_UNSELECTED_MODE) {
+            msg = STR_USB_STILL_CONNECTED;
+            msg_len = sizeof(TR_USB_STILL_CONNECTED);
           }
-#else
-          SET_WARNING_INFO(STR_MODEL_STILL_POWERED, sizeof(TR_MODEL_STILL_POWERED), 0);
-#endif
-
+          
           event_t evt = getEvent(false);
+          SET_WARNING_INFO(msg, msg_len, 0);
           DISPLAY_WARNING(evt);
           LED_ERROR_BEGIN();