2 files changed, 10 insertions, 11 deletions
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml
index f78c3e2958..2ff832de35 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -46,8 +46,8 @@ markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
           $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 
-#if($type() == "complex")
-for i in xrange(2*$nconnections):
+#if($type() == "complex" or $type() == "msg_complex")
+for i in xrange(#if $type.t == 'message' then 2 else 2*$nconnections#):
     if len(labels[i]) == 0:
         if(i % 2 == 0):
             self.$(id).set_line_label(i, "Re{{Data {0}}}".format(i/2))
@@ -540,14 +540,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 2 Width</name>
     <key>width2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -555,28 +555,28 @@ $(gui_hint()($win))</make>
     <name>Line 2 Color</name>
     <key>color2</key>
     <value>"red"</value>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 2 Style</name>
     <key>style2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 2 Marker</name>
     <key>marker2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else 'all'#</hide>
   </param>
 
 
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
index 26ddf793dc..3f3bbf4405 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -98,7 +98,6 @@ namespace gr {
       set_trigger_mode(TRIG_MODE_FREE, TRIG_SLOPE_POS, 0, 0);
 
       set_history(2);          // so we can look ahead for the trigger slope
-      declare_sample_delay(1); // delay the tags for a history of 2
    }
 
     const_sink_c_impl::~const_sink_c_impl()
@@ -439,7 +438,7 @@ namespace gr {
       if(tags.size() > 0) {
         d_triggered = true;
         trigger_index = tags[0].offset - nr;
-        d_start = d_index + trigger_index - 1;
+        d_start = d_index + trigger_index;
         d_end = d_start + d_size;
         d_trigger_count = 0;
       }
@@ -516,7 +515,7 @@ namespace gr {
         in = (const gr_complex*)input_items[n];
         volk_32fc_deinterleave_64f_x2(&d_residbufs_real[n][d_index],
                                       &d_residbufs_imag[n][d_index],
-                                      &in[0], nitems);
+                                      &in[history()-1], nitems);
       }
       d_index += nitems;