allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

catch assert()

Browse Source
This commit is contained in:
Robin Gareus
2013-07-31 15:17:22 +02:00
parent 097d851730
commit c212c16eb8
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/meter.cc
View File

@@ -270,7 +270,17 @@ PeakMeter::meter ()
return; return;
} }
assert(_visible_peak_power.size() == _peak_signal.size()); // TODO block this thread while PeakMeter::reset_max_channels() is
// reallocating channels.
// (may happen with Session > New: old session not yet closed,
// meter-thread still active while new one is initializing and
// maybe on other occasions, too)
if ( (visible_peak_power.size() != _peak_signal.size())
|| (_max_peak_power.size() != _peak_signal.size())
|| (_max_peak_signal.size() != _peak_signal.size())
) {
return;
}
const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ()); const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ());
const size_t n_midi = min (_peak_signal.size(), (size_t) current_meters.n_midi()); const size_t n_midi = min (_peak_signal.size(), (size_t) current_meters.n_midi());