Merge with latest 2.3

2020-10-07 21:01:45 +02:00
parent fd9ae06519 c07be1eb9b
commit 42a3198568
376 changed files with 10566 additions and 8633 deletions
@@ -36,6 +36,10 @@ void onModelSelectMenu(const char * result)
  int8_t sub = menuVerticalPosition;

  if (result == STR_SELECT_MODEL || result == STR_CREATE_MODEL) {
+    if (!g_eeGeneral.disableRssiPoweroffAlarm) {
+      if (!confirmModelChange())
+        return;
+    }
    selectModel(sub);
  }
  else if (result == STR_COPY_MODEL) {