fix(color): Wrong input could be used for updating curve preview (#4390)

EdgeTX · Dec 9, 2023 · b4f5ed5 · b4f5ed5
1 parent ad16bf6
commit b4f5ed5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/radio/src/gui/colorlcd/input_edit.cpp b/radio/src/gui/colorlcd/input_edit.cpp
@@ -159,3 +159,11 @@ void InputEditWindow::buildBody(FormWindow* form)
   });
   lv_obj_set_width(btn->getLvObj(), lv_pct(100));
 }
+
+void InputEditWindow::deleteLater(bool detach, bool trash)
+{
+  if (!deleted()) {
+    CurveEdit::SetCurrentSource(0);
+    Page::deleteLater(detach, trash);
+  }
+}
diff --git a/radio/src/gui/colorlcd/input_edit.h b/radio/src/gui/colorlcd/input_edit.h
@@ -38,4 +38,6 @@ class InputEditWindow : public Page
   Curve* preview;
 
   void buildBody(FormWindow *window);
+
+  void deleteLater(bool detach = true, bool trash = true) override;
 };
diff --git a/radio/src/gui/colorlcd/mixer_edit.cpp b/radio/src/gui/colorlcd/mixer_edit.cpp
@@ -146,3 +146,11 @@ void MixEditWindow::buildBody(FormWindow* form)
   });
   lv_obj_set_width(btn->getLvObj(), lv_pct(100));
 }
+
+void MixEditWindow::deleteLater(bool detach, bool trash)
+{
+  if (!deleted()) {
+    CurveEdit::SetCurrentSource(0);
+    Page::deleteLater(detach, trash);
+  }
+}
diff --git a/radio/src/gui/colorlcd/mixer_edit.h b/radio/src/gui/colorlcd/mixer_edit.h
@@ -38,4 +38,6 @@ class MixEditWindow : public Page
 
   void buildHeader(Window *window);
   void buildBody(FormWindow *window);
+
+  void deleteLater(bool detach = true, bool trash = true) override;
 };