Unified · Split
| @@ -157,13 +157,9 @@ void updateChannelSyncBuffer(void) · 156 unmodified lines | ||
| 157 | 157 | if (flags & SET_SCOPE_PERIOD) |
| 158 | 158 | scopeSetPeriod(ch, c->period); |
| 159 | 159 | |
| 160 | − if (flags & SET_SCOPE_DATA) | |
| 161 | − scope[ch].newData = c->newData; | |
| 162 | − | |
| 163 | − if (flags & SET_SCOPE_LENGTH) | |
| 164 | − scope[ch].newLength = c->newLength; | |
| 160 | + // the following handling order is important, don't change it! | |
| 165 | 161 | |
| 166 | − if (flags & STOP_SCOPE) // this must be handled *before* TRIGGER_SCOPE | |
| 162 | + if (flags & STOP_SCOPE) | |
| 167 | 163 | scope[ch].active = false; |
| 168 | 164 | |
| 169 | 165 | if (flags & TRIGGER_SCOPE) |
| @@ -173,6 +169,14 @@ void updateChannelSyncBuffer(void) · 3 unmodified lines | ||
| 173 | 169 | scopeTrigger(ch); |
| 174 | 170 | } |
| 175 | 171 | |
| 172 | + if (flags & SET_SCOPE_DATA) | |
| 173 | + scope[ch].newData = c->newData; | |
| 174 | + | |
| 175 | + if (flags & SET_SCOPE_LENGTH) | |
| 176 | + scope[ch].newLength = c->newLength; | |
| 177 | + | |
| 178 | + // --------------------------------------------------------------- | |
| 179 | + | |
| 176 | 180 | if (flags & UPDATE_ANALYZER) |
| 177 | 181 | updateSpectrumAnalyzer(c->analyzerVolume, c ->analyzerPeriod); |
| 178 | 182 | |