Merge pull request #615 from Paciente8159/614-bug-using-automatic-ext…

…ensions-macro-causes-part-of-the-extensions-to-not-be-rewritten fix modified handler of settings extension macro
Paciente8159 · Feb 13, 2024 · 054ac3d · 054ac3d
2 parents f4597e9 + a2ee413
commit 054ac3d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/uCNC/src/interface/settings.h b/uCNC/src/interface/settings.h
@@ -179,17 +179,17 @@ typedef uint16_t setting_offset_t;
 		if (set->address == SETTINGS_ADDRESS_OFFSET || set->address == set##ID##_settings_address) \
 		{                                                                                          \
 			settings_load(set##ID##_settings_address, (uint8_t *)var, sizeof(type) * count);       \
-			return EVENT_CONTINUE;                                                                 \
+			return (set->address == set##ID##_settings_address) ? EVENT_HANDLED : EVENT_CONTINUE;  \
 		}                                                                                          \
-		return EVENT_HANDLED;                                                                      \
+		return EVENT_CONTINUE;                                                                     \
 	}                                                                                              \
 	bool set##ID##_settings_save(void *args)                                                       \
 	{                                                                                              \
 		settings_args_t *set = (settings_args_t *)args;                                            \
 		if (set->address == SETTINGS_ADDRESS_OFFSET || set->address == set##ID##_settings_address) \
 		{                                                                                          \
 			settings_save(set##ID##_settings_address, (uint8_t *)var, sizeof(type) * count);       \
-			return EVENT_HANDLED;                                                                  \
+			return (set->address == set##ID##_settings_address) ? EVENT_HANDLED : EVENT_CONTINUE;  \
 		}                                                                                          \
 		return EVENT_CONTINUE;                                                                     \
 	}                                                                                              \
@@ -210,6 +210,7 @@ typedef uint16_t setting_offset_t;
 		if (set->address == SETTINGS_ADDRESS_OFFSET || set->address == set##ID##_settings_address) \
 		{                                                                                          \
 			memset(var, 0, sizeof(type) * count);                                                  \
+			return (set->address == set##ID##_settings_address) ? EVENT_HANDLED : EVENT_CONTINUE;  \
 		}                                                                                          \
 		return EVENT_HANDLED;                                                                      \
 	}                                                                                              \