From 1cef3ccf906bad9969ef0efa2d63f82022d7a764 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 20 Feb 2019 16:20:55 +0100
Subject: [PATCH] Port of the popup addition

---
 radio/src/gui/128x64/popups.cpp               | 8 ++------
 radio/src/gui/212x64/popups.cpp               | 8 ++------
 radio/src/gui/480x272/popups.cpp              | 8 ++------
 radio/src/io/frsky_device_firmware_update.cpp | 3 +++
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp
index 92930ce46..f252fedac 100644
--- a/radio/src/gui/128x64/popups.cpp
+++ b/radio/src/gui/128x64/popups.cpp
@@ -97,14 +97,10 @@ void runPopupWarning(event_t event)
   lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
-      if(warningType == WARNING_TYPE_INFO) {
-        warningText = NULL;
-        warningType = WARNING_TYPE_ASTERISK;
-      }
-      // no break
       if (warningType == WARNING_TYPE_ASTERISK)
         break;
-      warningResult = true;
+      if (warningType != WARNING_TYPE_INFO)
+        warningResult = true;
       // no break
     case EVT_KEY_BREAK(KEY_EXIT):
       warningText = NULL;
diff --git a/radio/src/gui/212x64/popups.cpp b/radio/src/gui/212x64/popups.cpp
index d36d65efb..82ff6b464 100644
--- a/radio/src/gui/212x64/popups.cpp
+++ b/radio/src/gui/212x64/popups.cpp
@@ -94,14 +94,10 @@ void runPopupWarning(event_t event)
   lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT));
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
-      if(warningType == WARNING_TYPE_INFO) {
-        warningText = NULL;
-        warningType = WARNING_TYPE_ASTERISK;
-      }
-      // no break
       if (warningType == WARNING_TYPE_ASTERISK)
         break;
-      warningResult = true;
+      if (warningType != WARNING_TYPE_INFO)
+        warningResult = true;
       // no break
 
     case EVT_KEY_BREAK(KEY_EXIT):
diff --git a/radio/src/gui/480x272/popups.cpp b/radio/src/gui/480x272/popups.cpp
index f5ae8bf22..147592d3c 100644
--- a/radio/src/gui/480x272/popups.cpp
+++ b/radio/src/gui/480x272/popups.cpp
@@ -81,14 +81,10 @@ void runPopupWarning(event_t event)
 
   switch (event) {
     case EVT_KEY_BREAK(KEY_ENTER):
-      if(warningType == WARNING_TYPE_INFO) {
-        warningText = NULL;
-        warningType = WARNING_TYPE_ASTERISK;
-      }
-      // no break
       if (warningType == WARNING_TYPE_ASTERISK)
         break;
-      warningResult = true;
+      if (warningType != WARNING_TYPE_INFO)
+        warningResult = true;
       // no break
 
     case EVT_KEY_BREAK(KEY_EXIT):
diff --git a/radio/src/io/frsky_device_firmware_update.cpp b/radio/src/io/frsky_device_firmware_update.cpp
index a4ba039c0..53e5a8fce 100644
--- a/radio/src/io/frsky_device_firmware_update.cpp
+++ b/radio/src/io/frsky_device_firmware_update.cpp
@@ -298,6 +298,9 @@ void DeviceFirmwareUpdate::flashFile(const char * filename)
     POPUP_WARNING(STR_FIRMWARE_UPDATE_ERROR);
     SET_WARNING_INFO(result, strlen(result), 0);
   }
+  else {
+    POPUP_INFORMATION(STR_FIRMWARE_UPDATE_SUCCESS);
+  }
 
 #if defined(PCBTARANIS) || defined(PCBHORUS)
   INTERNAL_MODULE_OFF();