Merge branch 'tagging' of github.com:trondeau/gnuradio into tagging

1 files changed, 17 insertions, 9 deletions

diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.cc b/gnuradio-core/src/lib/runtime/gr_block_executor.cc
index 4a35e25d5..9c30b1334 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_executor.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_executor.cc
@@ -110,15 +110,23 @@ propagate_tags(gr_block::tag_propagation_policy_t policy, gr_block_detail *d,
 			   d->nitems_read(i));
 
       std::vector<pmt::pmt_t>::iterator t;
-      for(t = rtags.begin(); t != rtags.end(); t++) {
-	uint64_t newcount = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*t, 0));
-	pmt::pmt_t newtup = pmt::mp(pmt::pmt_from_uint64(newcount * rrate),
-				    pmt::pmt_tuple_ref(*t, 1),
-				    pmt::pmt_tuple_ref(*t, 2),
-				    pmt::pmt_tuple_ref(*t, 3));
-				    
-	for(int o = 0; o < d->noutputs(); o++)
-	  d->output(o)->add_item_tag(newtup);
+      if(rrate != 1.0) {
+	for(t = rtags.begin(); t != rtags.end(); t++) {
+	  uint64_t newcount = pmt::pmt_to_uint64(pmt::pmt_tuple_ref(*t, 0));
+	  pmt::pmt_t newtup = pmt::mp(pmt::pmt_from_uint64(newcount * rrate),
+				      pmt::pmt_tuple_ref(*t, 1),
+				      pmt::pmt_tuple_ref(*t, 2),
+				      pmt::pmt_tuple_ref(*t, 3));
+	  
+	  for(int o = 0; o < d->noutputs(); o++)
+	    d->output(o)->add_item_tag(newtup);
+	}
+      }
+      else {
+	for(t = rtags.begin(); t != rtags.end(); t++) {
+	  for(int o = 0; o < d->noutputs(); o++)
+	    d->output(o)->add_item_tag(*t);
+	}
       }
     }
     break;