diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-28 14:42:05 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-28 14:42:05 -0400 |
| commit | e8769054c663d8d05d022e9a2d50aa2bd2e62e4e (patch) | |
| tree | dfee667dcedf232d2b5434043807b9c822ef248a /gr-qtgui/lib/const_sink_c_impl.cc | |
| parent | 96c25b5c757c407e73bc709d557ae8cb8e9d3b65 (diff) | |
| parent | c1fb14af7182a2be871118a475614559b4e89b90 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-qtgui/lib/const_sink_c_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/const_sink_c_impl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 029014045f..f7bdc01489 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -238,7 +238,7 @@ namespace gr { int channel, const std::string &tag_key) { - gr::thread::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_setlock); d_trigger_mode = mode; d_trigger_slope = slope; @@ -308,7 +308,7 @@ namespace gr { void const_sink_c_impl::set_nsamps(const int newsize) { - gr::thread::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_setlock); if(newsize != d_size) { // Set new size and reset buffer index @@ -331,6 +331,7 @@ namespace gr { } d_main_gui->setNPoints(d_size); + _reset(); } } @@ -361,7 +362,7 @@ namespace gr { void const_sink_c_impl::reset() { - gr::thread::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_setlock); _reset(); } |