diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index ec1496e68b..e53cecc873 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -4797,23 +4797,24 @@ TempoMap::set_state_3x (const XMLNode& node) Tempos::iterator prev = _tempos.end(); for (Tempos::iterator i = _tempos.begin(); i != _tempos.end(); ++i) { if (prev != _tempos.end()) { - MeterSection* ms; - MeterSection* prev_m; - TempoSection* ts; - TempoSection* prev_t; - if ((prev_m = dynamic_cast(*prev)) != 0 && (ms = dynamic_cast(*i)) != 0) { - if (prev_m->beat() == ms->beat()) { - error << string_compose (_("Multiple meter definitions found at %1"), prev_m->beat()) << endmsg; - return -1; - } - } else if ((prev_t = dynamic_cast(*prev)) != 0 && (ts = dynamic_cast(*i)) != 0) { - if (prev_t->pulse() == ts->pulse()) { - error << string_compose (_("Multiple tempo definitions found at %1"), prev_t->pulse()) << endmsg; - return -1; + MeterSection* ms; + MeterSection* prev_m; + TempoSection* ts; + TempoSection* prev_t; + if ((prev_m = dynamic_cast(*prev)) != 0 && (ms = dynamic_cast(*i)) != 0) { + if (prev_m->beat() == ms->beat()) { + error << string_compose (_("Multiple meter definitions found at %1"), prev_m->beat()) << endmsg; + return -1; + } + } else if ((prev_t = dynamic_cast(*prev)) != 0 && (ts = dynamic_cast(*i)) != 0) { + if (prev_t->pulse() == ts->pulse()) { + error << string_compose (_("Multiple tempo definitions found at %1"), prev_t->pulse()) << endmsg; + return -1; + } } } + prev = i; } - prev = i; } #endif reset_starting_at (0);