summaryrefslogtreecommitdiff
path: root/gnuradio-core/src/lib
diff options
context:
space:
mode:
authorTom Rondeau2012-02-17 15:40:04 -0500
committerTom Rondeau2012-02-17 15:40:04 -0500
commitfed443d1ae6bb78b24de54be5daa9647c5368faa (patch)
treebdde4a0931f7df583ad5337bf82701242277ac01 /gnuradio-core/src/lib
parent14e35939bd3ddf7077a0589424f99ad2c3e51a7f (diff)
downloadgnuradio-fed443d1ae6bb78b24de54be5daa9647c5368faa.tar.gz
gnuradio-fed443d1ae6bb78b24de54be5daa9647c5368faa.tar.bz2
gnuradio-fed443d1ae6bb78b24de54be5daa9647c5368faa.zip
core: protection if set_delay is called before the last delay update has finished.
Diffstat (limited to 'gnuradio-core/src/lib')
-rw-r--r--gnuradio-core/src/lib/general/gr_delay.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_delay.cc b/gnuradio-core/src/lib/general/gr_delay.cc
index 30c9a235d..aedd461f8 100644
--- a/gnuradio-core/src/lib/general/gr_delay.cc
+++ b/gnuradio-core/src/lib/general/gr_delay.cc
@@ -63,7 +63,7 @@ gr_delay::set_delay (int d)
gruel::scoped_lock l(d_mutex_delay);
int old = delay();
set_history(d+1);
- d_delta = delay() - old;
+ d_delta += delay() - old;
}
}