diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gnuradio-runtime/lib/circular_file.cc | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-runtime/lib/circular_file.cc')
| -rw-r--r-- | gnuradio-runtime/lib/circular_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/circular_file.cc b/gnuradio-runtime/lib/circular_file.cc index 4d7d06082a..9cef419426 100644 --- a/gnuradio-runtime/lib/circular_file.cc +++ b/gnuradio-runtime/lib/circular_file.cc @@ -184,7 +184,7 @@ namespace gr { int buffer_current = d_header[HD_BUFFER_CURRENT]; int buffer_size = d_header[HD_BUFFER_SIZE]; int total = 0; - + nbytes = std::min(nbytes, buffer_size - d_bytes_read); while(nbytes > 0) { |