Bugfix: Reset config_changed flag when aborting state check. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Fri, 16 Sep 2011 09:19:24 +0200
branchstable-1.5
changeset 2111 d9d56e56f2a2
parent 2109 755e6ce823f0
child 2114 b91bb9b96823
Bugfix: Reset config_changed flag when aborting state check.
master/fsm_master.c
--- a/master/fsm_master.c	Thu Sep 15 16:33:13 2011 +0200
+++ b/master/fsm_master.c	Fri Sep 16 09:19:24 2011 +0200
@@ -567,6 +567,8 @@
     ec_slave_t *slave = fsm->slave;
 
     if (master->config_changed) {
+        master->config_changed = 0;
+
         // abort iterating through slaves,
         // first compensate DC system time offsets,
         // then begin configuring at slave 0
@@ -819,6 +821,8 @@
 #endif
 
     if (master->slave_count) {
+        master->config_changed = 0;
+
         fsm->slave = master->slaves; // begin with first slave
         ec_fsm_master_enter_write_system_times(fsm);
     } else {