diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-22 10:04:28 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-06-22 10:04:28 -0700 |
| commit | a00231d5fc7411c8bb3f0ffdf72f2ccabd2477b6 (patch) | |
| tree | de07a61632c7e9f1f6df9da0df89623f810ae9b4 /gnuradio-runtime/lib/tpb_thread_body.cc | |
| parent | 11fd3f467ab8a8c7e548dfed092d102945770f99 (diff) | |
| parent | 48e5bff6fe99b5d4654fcb03a6f8da8a206eb7d7 (diff) | |
Merge branch 'maint'
Conflicts:
gnuradio-core/src/lib/runtime/gr_tpb_thread_body.cc
Diffstat (limited to 'gnuradio-runtime/lib/tpb_thread_body.cc')
| -rw-r--r-- | gnuradio-runtime/lib/tpb_thread_body.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc index c49594c931..f9e543b0e5 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.cc +++ b/gnuradio-runtime/lib/tpb_thread_body.cc @@ -119,6 +119,9 @@ namespace gr { guard.lock(); } } + if (d->done()) { + return; + } } } break; |