projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix potential deadlock on session-load
[ardour.git]
/
libs
/
ardour
/
audio_port.cc
diff --git
a/libs/ardour/audio_port.cc
b/libs/ardour/audio_port.cc
index e2bb20dbe958c20753422e202e0d74cf8a911fa8..33e41c10ad49cc309615af9d4778e0d5d426b610 100644
(file)
--- a/
libs/ardour/audio_port.cc
+++ b/
libs/ardour/audio_port.cc
@@
-59,8
+59,11
@@
void
AudioPort::cycle_end (pframes_t nframes)
{
if (sends_output() && !_buffer->written()) {
AudioPort::cycle_end (pframes_t nframes)
{
if (sends_output() && !_buffer->written()) {
- if (_buffer->capacity() >= nframes) {
- _buffer->silence (nframes);
+ if (!_buffer->data (0)) {
+ get_audio_buffer (nframes);
+ }
+ if (_buffer->capacity() >= nframes) {
+ _buffer->silence (nframes);
}
}
}
}
}
}