fixed profile save

eez-open · Jul 19, 2019 · 6ddd7f5 · 6ddd7f5
1 parent a5cf720
commit 6ddd7f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/eez/apps/psu/gui/data.cpp b/src/eez/apps/psu/gui/data.cpp
@@ -2907,12 +2907,7 @@ void data_channel_list_count(data::DataOperationEnum operation, data::Cursor &cu
 
 void data_channel_lists(data::DataOperationEnum operation, data::Cursor &cursor,
                         data::Value &value) {
-    if (operation == data::DATA_OPERATION_GET) {
-        ChSettingsListsPage *page = (ChSettingsListsPage *)getPage(PAGE_ID_CH_SETTINGS_LISTS);
-        if (page) {
-            value = data::Value(page->m_listVersion);
-        }
-    } else if (operation == data::DATA_OPERATION_COUNT) {
+    if (operation == data::DATA_OPERATION_COUNT) {
         value = LIST_ITEMS_PER_PAGE;
     } else if (operation == data::DATA_OPERATION_GET_FLOAT_LIST_LENGTH) {
         ChSettingsListsPage *page = (ChSettingsListsPage *)getPage(PAGE_ID_CH_SETTINGS_LISTS);

diff --git a/src/eez/apps/psu/profile.cpp b/src/eez/apps/psu/profile.cpp
@@ -318,7 +318,7 @@ void doSave() {
 }
 
 void save(bool immediately) {
-    if (g_saveEnabled) {
+    if (g_saveEnabled && isAutoSaveAllowed()) {
         if (immediately) {
             doSave();
             g_profileDirty = false;
@@ -329,7 +329,7 @@ void save(bool immediately) {
 }
 
 void tick() {
-    if (g_profileDirty && isAutoSaveAllowed() && !list::isActive() && !calibration::isEnabled() && idle::isIdle()) {
+    if (g_profileDirty && !list::isActive() && !calibration::isEnabled() && idle::isIdle()) {
         doSave();
         g_profileDirty = false;
     }
@@ -365,6 +365,7 @@ bool recall(int location) {
         if (persist_conf::loadProfile(location, &profile) && profile.flags.isValid) {
             if (persist_conf::saveProfile(0, &profile)) {
                 if (recallFromProfile(&profile, location)) {
+                    save();
                     event_queue::pushEvent(event_queue::EVENT_INFO_RECALL_FROM_PROFILE_0 + location);
                     return true;
                 } else {