diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 16:55:04 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-22 16:55:04 -0700 |
| commit | d8b3e478fed02053d06ad41037db1f9c9728c3b5 (patch) | |
| tree | db9e979dadfe3e8f2a200348a3140d47de84c0d3 /gr-blocks/lib/file_meta_source_impl.cc | |
| parent | 37d373acee2112b0bb350e5abe09aca0115e5cc6 (diff) | |
| parent | 1cb458583e142b67843645fe8346c9ce47c68398 (diff) | |
Merge branch 'maint'
Conflicts:
gr-uhd/apps/uhd_app.py
Diffstat (limited to 'gr-blocks/lib/file_meta_source_impl.cc')
| -rw-r--r-- | gr-blocks/lib/file_meta_source_impl.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index 4cb0ab8ed1..3c72e2a003 100644 --- a/gr-blocks/lib/file_meta_source_impl.cc +++ b/gr-blocks/lib/file_meta_source_impl.cc @@ -111,17 +111,7 @@ namespace gr { { close(); - if(d_fp) { - fclose(d_fp); - d_fp = 0; - } - if(d_state == STATE_DETACHED) { - if(d_hdr_fp) { - fclose(d_hdr_fp); - d_hdr_fp = 0; - } - } } bool @@ -339,6 +329,18 @@ namespace gr { d_new_fp = 0; } d_updated = true; + + if (d_fp) { + fclose(d_fp); + d_fp = 0; + } + + if (d_state == STATE_DETACHED) { + if (d_hdr_fp) { + fclose(d_hdr_fp); + d_hdr_fp = 0; + } + } } void |