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/number_sink_impl.cc | |
| parent | 96c25b5c757c407e73bc709d557ae8cb8e9d3b65 (diff) | |
| parent | c1fb14af7182a2be871118a475614559b4e89b90 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-qtgui/lib/number_sink_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/number_sink_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index ca0f0bdf10..ca4a567ca3 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -293,7 +293,7 @@ namespace gr { void number_sink_impl::reset() { - gr::thread::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_setlock); _reset(); } @@ -324,7 +324,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gr::thread::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_setlock); _gui_update_trigger(); |