From b259d0baebdba95da01004b7338eb203809e0542 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 18 Apr 2021 09:41:15 +0200
Subject: [PATCH] Save screen settings when leaving screen (only)

---
 radio/src/gui/colorlcd/menu_screen.cpp  | 2 ++
 radio/src/gui/colorlcd/screen_setup.cpp | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/colorlcd/menu_screen.cpp b/radio/src/gui/colorlcd/menu_screen.cpp
index 1013fa5ba..ad2bd61cd 100644
--- a/radio/src/gui/colorlcd/menu_screen.cpp
+++ b/radio/src/gui/colorlcd/menu_screen.cpp
@@ -22,6 +22,7 @@
 #include "menu_screen.h"
 #include "screen_setup.h"
 #include "view_main.h"
+#include "storage/storage.h"
 
 ScreenMenu::ScreenMenu():
   TabsGroup(ICON_THEME)
@@ -30,6 +31,7 @@ ScreenMenu::ScreenMenu():
 
   setCloseHandler([]{
       ViewMain::instance()->updateTopbarVisibility();
+      storageDirty(EE_MODEL);
   });
 }
 
diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index ed43571f9..bbbfcd8dc 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -222,7 +222,6 @@ class SetupWidgetsPage: public FormWindow
       if (event == EVT_KEY_LONG(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_EXIT)) {
         killEvents(event);
         deleteLater();
-        SET_DIRTY();
       }
     }
 #endif
@@ -327,8 +326,6 @@ void ScreenAddPage::build(FormWindow * window)
         if (menu->getTabs() < MAX_CUSTOM_SCREENS) {
           menu->addTab(new ScreenAddPage(menu, menu->getTabs()));
         }
-
-        storageDirty(EE_MODEL);
       }
       else {
         TRACE("Add main view: factory is NULL");
@@ -417,7 +414,6 @@ void ScreenSetupPage::build(FormWindow * window)
     optionsWindow->clear();
     createCustomScreen(factory, idx);
     updateLayoutOptions(optionsWindow, idx);
-    SET_DIRTY();
   };
   
   auto layoutChoice = new LayoutChoice(window, layoutSlot, getFactory, setLayout);
@@ -470,9 +466,6 @@ void ScreenSetupPage::build(FormWindow * window)
         pageIdx = menu->getTabs() - 2;
       }      
       menu->setCurrentTab(pageIdx);
-
-      // save the changes
-      storageDirty(EE_MODEL);  
       return 0;
     });